commit 100649c5f0fa769d3f59d3f96743ad4669e307ed
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 12 20:49:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 12 20:49:05 2017 +0000
tree dea9f0c70719b45c9ba9ef10c49aef46ce4a7a2c
parent b09e536cd2ca7693933f82f797f4710ad2dc936a
parent 9998a4cc7aff2275aef973e7345975c04f828d2e

Merge "Bluetooth: Run VTS tests with framework enabled" into oc-dev

bluetooth/V1_0/target/AndroidTest.xml

diff --git a/bluetooth/V1_0/target/AndroidTest.xml b/bluetooth/V1_0/target/AndroidTest.xml
index c877fe5..b18923b 100644
--- a/bluetooth/V1_0/target/AndroidTest.xml
+++ b/bluetooth/V1_0/target/AndroidTest.xml
@@ -25,9 +25,7 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalBluetoothV1_0TargetTest/VtsHalBluetoothV1_0TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="binary-test-disable-framework" value="true"/>
-        <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
-        <option name="native-server-process-name" value="com.android.bluetooth"/>
         <option name="test-timeout" value="3m"/>
     </test>
 </configuration>

bluetooth/V1_0/target_profiling/AndroidTest.xml

diff --git a/bluetooth/V1_0/target_profiling/AndroidTest.xml b/bluetooth/V1_0/target_profiling/AndroidTest.xml
index fa032eb..0290cda 100644
--- a/bluetooth/V1_0/target_profiling/AndroidTest.xml
+++ b/bluetooth/V1_0/target_profiling/AndroidTest.xml
@@ -28,10 +28,8 @@
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalBluetoothV1_0TargetTest/VtsHalBluetoothV1_0TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
         <option name="binary-test-disable-framework" value="true"/>
-        <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.bluetooth@1.0"/>
-        <option name="native-server-process-name" value="com.android.bluetooth"/>
         <option name="test-timeout" value="3m"/>
     </test>
 </configuration>