Merge "Expose HidlInstrumentor data."
diff --git a/Android.bp b/Android.bp
index ae04548..6abdab8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,13 +18,17 @@
"transport", // libhidltransport
]
-libhidl_flags = [
- "-Wall",
- "-Werror",
-]
+cc_defaults {
+ name: "libhidl-defaults",
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
cc_test {
name: "libhidl_test",
+ defaults: ["libhidl-defaults"],
gtest: false,
srcs: ["test_main.cpp"],
@@ -42,5 +46,5 @@
cflags: [
"-O0",
"-g",
- ] + libhidl_flags,
+ ],
}
diff --git a/base/Android.bp b/base/Android.bp
index e4cf6cb..5d79e81 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -15,7 +15,11 @@
cc_library_shared {
name: "libhidlbase",
vendor_available: true,
- cflags: libhidl_flags,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ defaults: ["libhidl-defaults"],
shared_libs: [
"libbase",
"libcutils",
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 89b39dc..e854ab5 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -15,7 +15,11 @@
cc_library {
name: "libhidlmemory",
vendor_available: true,
- cflags: libhidl_flags,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ defaults: ["libhidl-defaults"],
shared_libs: [
"libbase",
"liblog",
diff --git a/transport/Android.bp b/transport/Android.bp
index 7fc3717..62aee52 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -27,8 +27,14 @@
cc_library_shared {
name: "libhidltransport",
vendor_available: true,
- defaults: ["hidl-module-defaults"],
- cflags: libhidl_flags,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ defaults: [
+ "libhidl-defaults",
+ "hidl-module-defaults",
+ ],
shared_libs: [
"libbase",
"liblog",
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 0cff7f3..c64a039 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -42,6 +42,9 @@
generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
export_generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp
index 7d5fd8b..fc352c3 100644
--- a/transport/allocator/1.0/default/Android.bp
+++ b/transport/allocator/1.0/default/Android.bp
@@ -15,7 +15,7 @@
cc_binary {
name: "android.hidl.allocator@1.0-service",
relative_install_path: "hw",
- cflags: libhidl_flags,
+ defaults: ["libhidl-defaults"],
srcs: [
"AshmemAllocator.cpp",
"service.cpp"
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 0ae2422..b6044c2 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -49,6 +49,10 @@
generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
export_generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/transport/memory/1.0/default/Android.bp b/transport/memory/1.0/default/Android.bp
index 93f6370..a996f26 100644
--- a/transport/memory/1.0/default/Android.bp
+++ b/transport/memory/1.0/default/Android.bp
@@ -16,7 +16,7 @@
name: "android.hidl.memory@1.0-impl",
compile_multilib: "both",
relative_install_path: "hw",
- cflags: libhidl_flags,
+ defaults: ["libhidl-defaults"],
srcs: [
"AshmemMapper.cpp",
"AshmemMemory.cpp",
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 5e5f29d..957d1f9 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -42,6 +42,9 @@
generated_headers: ["android.hidl.token@1.0_genc++_headers"],
export_generated_headers: ["android.hidl.token@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index 0360d99..101f3b4 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -14,6 +14,10 @@
cc_library {
name: "android.hidl.token@1.0-utils",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"HybridInterface.cpp",