Merge "bpfmt native/android/Android.bp" am: b33f9df49c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528 Change-Id: Ieabf281255a870d5bb54df317f57ae8a148a70a4
This commit is contained in:
@@ -62,7 +62,7 @@ cc_library_shared {
|
||||
"surface_texture.cpp",
|
||||
"system_fonts.cpp",
|
||||
"trace.cpp",
|
||||
"thermal.cpp"
|
||||
"thermal.cpp",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
@@ -75,7 +75,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",
|
||||
@@ -96,7 +96,7 @@ cc_library_shared {
|
||||
"libarect",
|
||||
],
|
||||
|
||||
header_libs: [ "libhwui_internal_headers",],
|
||||
header_libs: ["libhwui_internal_headers"],
|
||||
|
||||
whole_static_libs: ["libnativewindow"],
|
||||
|
||||
@@ -130,27 +130,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"],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user