Merge "bpfmt native/android/Android.bp" am: b33f9df49c am: f91d043cfc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528

Change-Id: I5657c340dc381858e5f2edddc6ee8c515e01b4b5
This commit is contained in:
Treehugger Robot
2021-04-23 07:36:38 +00:00
committed by Automerger Merge Worker

View File

@@ -62,7 +62,7 @@ cc_library_shared {
"surface_texture.cpp", "surface_texture.cpp",
"system_fonts.cpp", "system_fonts.cpp",
"trace.cpp", "trace.cpp",
"thermal.cpp" "thermal.cpp",
], ],
shared_libs: [ shared_libs: [
@@ -75,7 +75,7 @@ cc_library_shared {
"libbinder", "libbinder",
"libui", "libui",
"libgui", "libgui",
"libharfbuzz_ng", // Only for including hb.h via minikin "libharfbuzz_ng", // Only for including hb.h via minikin
"libsensor", "libsensor",
"libactivitymanager_aidl", "libactivitymanager_aidl",
"libandroid_runtime", "libandroid_runtime",
@@ -96,7 +96,7 @@ cc_library_shared {
"libarect", "libarect",
], ],
header_libs: [ "libhwui_internal_headers",], header_libs: ["libhwui_internal_headers"],
whole_static_libs: ["libnativewindow"], whole_static_libs: ["libnativewindow"],
@@ -130,27 +130,26 @@ llndk_library {
unversioned: true, unversioned: true,
} }
// Aidl library for platform compat. // Aidl library for platform compat.
cc_library_shared { cc_library_shared {
name: "lib-platform-compat-native-api", name: "lib-platform-compat-native-api",
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-Werror",
"-Wno-missing-field-initializers", "-Wno-missing-field-initializers",
"-Wno-unused-variable", "-Wno-unused-variable",
"-Wunused-parameter", "-Wunused-parameter",
], ],
shared_libs: [ shared_libs: [
"libbinder", "libbinder",
"libutils", "libutils",
], ],
aidl: { aidl: {
local_include_dirs: ["aidl"], local_include_dirs: ["aidl"],
export_aidl_headers: true, export_aidl_headers: true,
}, },
srcs: [ srcs: [
":platform-compat-native-aidl", ":platform-compat-native-aidl",
], ],
export_include_dirs: ["aidl"], export_include_dirs: ["aidl"],
} }