Merge changes Ie7e60128,I1a648227 am: 115b1a7dae am: 55aed9749d am: e1ac0f101c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2395913
Change-Id: I63245b06b0cc0b1ee08f70b7187200d1d60e2ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/aidl/TEST_MAPPING b/bluetooth/aidl/TEST_MAPPING
new file mode 100644
index 0000000..342a1e4
--- /dev/null
+++ b/bluetooth/aidl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit" : [
+ {
+ "name" : "VtsHalBluetoothTargetTest"
+ }
+ ]
+}
diff --git a/bluetooth/aidl/vts/Android.bp b/bluetooth/aidl/vts/Android.bp
index c6c9b9e..414f707 100644
--- a/bluetooth/aidl/vts/Android.bp
+++ b/bluetooth/aidl/vts/Android.bp
@@ -15,12 +15,12 @@
],
srcs: ["VtsHalBluetoothTargetTest.cpp"],
shared_libs: [
- "android.hardware.bluetooth-V1-ndk",
"libbase",
"libbinder_ndk",
"libcutils",
],
static_libs: [
+ "android.hardware.bluetooth-V1-ndk",
"libbluetooth-types",
],
test_config: "VtsHalBluetoothTargetTest.xml",