diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-23 04:51:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-23 04:51:12 +0000 |
| commit | 8af1716cc582d850654868774904378ab24d68c2 (patch) | |
| tree | 66978891e86c1d98fe069f57bf532695fab381dd /native | |
| parent | 8327ce6b24655ceb0d0bad1e697f7cbbd4d40484 (diff) | |
| parent | b16eb69e6dac55b85b036a110705680cb737f5c1 (diff) | |
Merge "bpfmt native/android/Android.bp" into sc-dev
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.bp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/native/android/Android.bp b/native/android/Android.bp index 5bb4fbc85bf9..24c93ce63b1e 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -64,7 +64,7 @@ cc_library_shared { "surface_texture.cpp", "system_fonts.cpp", "trace.cpp", - "thermal.cpp" + "thermal.cpp", ], shared_libs: [ @@ -77,7 +77,7 @@ cc_library_shared { "libbinder", "libui", "libgui", - "libharfbuzz_ng", // Only for including hb.h via minikin + "libharfbuzz_ng", // Only for including hb.h via minikin "libsensor", "libactivitymanager_aidl", "libandroid_runtime", @@ -98,7 +98,10 @@ cc_library_shared { "libarect", ], - header_libs: [ "libhwui_internal_headers", "libandroid_headers_private"], + header_libs: [ + "libhwui_internal_headers", + "libandroid_headers_private", + ], whole_static_libs: ["libnativewindow"], @@ -106,14 +109,17 @@ cc_library_shared { include_dirs: ["bionic/libc/dns/include"], - local_include_dirs: [ "include_platform", ], + local_include_dirs: ["include_platform"], - export_include_dirs: [ "include_platform", ], + export_include_dirs: ["include_platform"], version_script: "libandroid.map.txt", stubs: { symbol_file: "libandroid.map.txt", - versions: ["29", "31"], + versions: [ + "29", + "31", + ], }, } @@ -136,27 +142,26 @@ llndk_library { unversioned: true, } - // Aidl library for platform compat. cc_library_shared { name: "lib-platform-compat-native-api", cflags: [ - "-Wall", - "-Werror", - "-Wno-missing-field-initializers", - "-Wno-unused-variable", - "-Wunused-parameter", - ], + "-Wall", + "-Werror", + "-Wno-missing-field-initializers", + "-Wno-unused-variable", + "-Wunused-parameter", + ], shared_libs: [ "libbinder", - "libutils", + "libutils", ], aidl: { local_include_dirs: ["aidl"], export_aidl_headers: true, }, srcs: [ - ":platform-compat-native-aidl", + ":platform-compat-native-aidl", ], export_include_dirs: ["aidl"], } |