Update build file for profilier am: e516c12cce am: abeed21c9f
am: 5b4df770c8
Change-Id: I430d6be7d1950359be42428d47f51682ba60bc45
diff --git a/bluetooth/V1_0/build/Android.bp b/bluetooth/V1_0/build/Android.bp
index 96d7e34..b55554b 100644
--- a/bluetooth/V1_0/build/Android.bp
+++ b/bluetooth/V1_0/build/Android.bp
@@ -118,6 +118,8 @@
export_generated_headers: ["android.hardware.bluetooth@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/boot/V1_0/build/Android.bp b/boot/V1_0/build/Android.bp
index 74c7cc0..0a969ca 100644
--- a/boot/V1_0/build/Android.bp
+++ b/boot/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.boot@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/configstore/V1_0/build/Android.bp b/configstore/V1_0/build/Android.bp
index 18d92e0..d1fdc5b 100644
--- a/configstore/V1_0/build/Android.bp
+++ b/configstore/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.configstore@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/ir/V1_0/build/Android.bp b/ir/V1_0/build/Android.bp
index 82dfc73..09c3ff5 100644
--- a/ir/V1_0/build/Android.bp
+++ b/ir/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.ir@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/nfc/V1_0/build/Android.bp b/nfc/V1_0/build/Android.bp
index 7b59fd7..195947a 100644
--- a/nfc/V1_0/build/Android.bp
+++ b/nfc/V1_0/build/Android.bp
@@ -118,6 +118,8 @@
export_generated_headers: ["android.hardware.nfc@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/radio/V1_0/build/Android.bp b/radio/V1_0/build/Android.bp
index ab47853..0df8a75 100644
--- a/radio/V1_0/build/Android.bp
+++ b/radio/V1_0/build/Android.bp
@@ -133,6 +133,8 @@
export_generated_headers: ["android.hardware.radio@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/radio/V1_1/build/Android.bp b/radio/V1_1/build/Android.bp
index ccdf7cc..99a43e6 100644
--- a/radio/V1_1/build/Android.bp
+++ b/radio/V1_1/build/Android.bp
@@ -125,6 +125,8 @@
export_generated_headers: ["android.hardware.radio@1.1-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/radio/deprecated/V1_0/build/Android.bp b/radio/deprecated/V1_0/build/Android.bp
index 033a996..8c8dcd3 100644
--- a/radio/deprecated/V1_0/build/Android.bp
+++ b/radio/deprecated/V1_0/build/Android.bp
@@ -120,6 +120,8 @@
export_generated_headers: ["android.hardware.radio.deprecated@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/renderscript/V1_0/build/Android.bp b/renderscript/V1_0/build/Android.bp
index ace0999..a92d88d 100644
--- a/renderscript/V1_0/build/Android.bp
+++ b/renderscript/V1_0/build/Android.bp
@@ -118,6 +118,8 @@
export_generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/script/build/template/vts_build_template.bp b/script/build/template/vts_build_template.bp
index 9d41eb6..25d855b 100644
--- a/script/build/template/vts_build_template.bp
+++ b/script/build/template/vts_build_template.bp
@@ -105,6 +105,8 @@
export_generated_headers: ["android.hardware.{HAL_NAME}@{HAL_VERSION}-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/bar/V1_0/build/Android.bp b/tests/bar/V1_0/build/Android.bp
index e1fab0b..ab0c744 100644
--- a/tests/bar/V1_0/build/Android.bp
+++ b/tests/bar/V1_0/build/Android.bp
@@ -135,6 +135,8 @@
export_generated_headers: ["android.hardware.tests.bar@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/baz/V1_0/build/Android.bp b/tests/baz/V1_0/build/Android.bp
index 949452c..38f28aa 100644
--- a/tests/baz/V1_0/build/Android.bp
+++ b/tests/baz/V1_0/build/Android.bp
@@ -128,6 +128,8 @@
export_generated_headers: ["android.hardware.tests.baz@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/expression/V1_0/build/Android.bp b/tests/expression/V1_0/build/Android.bp
index b0f2108..a98ab96 100644
--- a/tests/expression/V1_0/build/Android.bp
+++ b/tests/expression/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.tests.expression@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/foo/V1_0/build/Android.bp b/tests/foo/V1_0/build/Android.bp
index 86c7c85..3ee0f80 100644
--- a/tests/foo/V1_0/build/Android.bp
+++ b/tests/foo/V1_0/build/Android.bp
@@ -133,6 +133,8 @@
export_generated_headers: ["android.hardware.tests.foo@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/hash/V1_0/build/Android.bp b/tests/hash/V1_0/build/Android.bp
index 1e121c3..0a28dcc 100644
--- a/tests/hash/V1_0/build/Android.bp
+++ b/tests/hash/V1_0/build/Android.bp
@@ -108,6 +108,8 @@
export_generated_headers: ["android.hardware.tests.hash@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/inheritance/V1_0/build/Android.bp b/tests/inheritance/V1_0/build/Android.bp
index efa8f73..f3ffe60 100644
--- a/tests/inheritance/V1_0/build/Android.bp
+++ b/tests/inheritance/V1_0/build/Android.bp
@@ -123,6 +123,8 @@
export_generated_headers: ["android.hardware.tests.inheritance@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index fe6147e..9cbc910 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.tests.libhwbinder@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/memory/V1_0/build/Android.bp b/tests/memory/V1_0/build/Android.bp
index 99d19d7..5505bca 100644
--- a/tests/memory/V1_0/build/Android.bp
+++ b/tests/memory/V1_0/build/Android.bp
@@ -108,6 +108,8 @@
export_generated_headers: ["android.hardware.tests.memory@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/msgq/V1_0/build/Android.bp b/tests/msgq/V1_0/build/Android.bp
index ad23006..a1b03e4 100644
--- a/tests/msgq/V1_0/build/Android.bp
+++ b/tests/msgq/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.tests.msgq@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tests/pointer/V1_0/build/Android.bp b/tests/pointer/V1_0/build/Android.bp
index 714327e..26eddc6 100644
--- a/tests/pointer/V1_0/build/Android.bp
+++ b/tests/pointer/V1_0/build/Android.bp
@@ -113,6 +113,8 @@
export_generated_headers: ["android.hardware.tests.pointer@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/tetheroffload/config/V1_0/build/Android.bp b/tetheroffload/config/V1_0/build/Android.bp
index c9551fb..3382e6c 100644
--- a/tetheroffload/config/V1_0/build/Android.bp
+++ b/tetheroffload/config/V1_0/build/Android.bp
@@ -108,6 +108,8 @@
export_generated_headers: ["android.hardware.tetheroffload.config@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
@@ -115,7 +117,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tetheroffload.config@1.0",
-
],
cflags: [
"-Wall",
diff --git a/tetheroffload/control/V1_0/build/Android.bp b/tetheroffload/control/V1_0/build/Android.bp
index 9de3359..a6850a3 100644
--- a/tetheroffload/control/V1_0/build/Android.bp
+++ b/tetheroffload/control/V1_0/build/Android.bp
@@ -118,6 +118,8 @@
export_generated_headers: ["android.hardware.tetheroffload.control@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
@@ -125,7 +127,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tetheroffload.control@1.0",
-
],
cflags: [
"-Wall",
diff --git a/wifi/V1_0/build/Android.bp b/wifi/V1_0/build/Android.bp
index 3ed1d0a..7fac837 100644
--- a/wifi/V1_0/build/Android.bp
+++ b/wifi/V1_0/build/Android.bp
@@ -173,6 +173,8 @@
export_generated_headers: ["android.hardware.wifi@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",
diff --git a/wifi/supplicant/V1_0/build/Android.bp b/wifi/supplicant/V1_0/build/Android.bp
index 1613bd9..5a2c713 100644
--- a/wifi/supplicant/V1_0/build/Android.bp
+++ b/wifi/supplicant/V1_0/build/Android.bp
@@ -168,6 +168,8 @@
export_generated_headers: ["android.hardware.wifi.supplicant@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libvts_common",