Merge changes Ie7e60128,I1a648227
* changes:
Move AIDL library from shared to static for BT VTS
Add bluetooth VTS to TEST_MAPPING
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",