commit aaf44090231854c541dfa961ab2d12fce8f74adc
author Zhuoyao Zhang <zhuoyao@google.com> Tue May 16 23:00:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 16 23:00:56 2017 +0000
tree 714b4d46939a16a0d6df3d0a1e6e7eb5769b4496
parent cb19291b3bd81fb2756a50d072c42ab9812d9b11
parent 6e2ee21f76c3d5cc21b7dee9120b040016ed6ce5

Merge "Fix VtsHalRenderscriptV1_0TargetProfiling test."

bluetooth/V1_0/target/AndroidTest.xml

diff --git a/bluetooth/V1_0/target/AndroidTest.xml b/bluetooth/V1_0/target/AndroidTest.xml
index c877fe5..e1eb6ad 100644
--- a/bluetooth/V1_0/target/AndroidTest.xml
+++ b/bluetooth/V1_0/target/AndroidTest.xml
@@ -24,7 +24,8 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalBluetoothV1_0TargetTest/VtsHalBluetoothV1_0TargetTest"/>
         <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"/>
+        <!-- The Bluetooth HAL depends on the scheduler service. -->
+        <option name="binary-test-disable-framework" value="false"/>
         <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"/>

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..e8e3a86 100644
--- a/bluetooth/V1_0/target_profiling/AndroidTest.xml
+++ b/bluetooth/V1_0/target_profiling/AndroidTest.xml
@@ -27,7 +27,8 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalBluetoothV1_0TargetTest/VtsHalBluetoothV1_0TargetTest"/>
         <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"/>
+        <!-- The Bluetooth HAL depends on the scheduler service. -->
+        <option name="binary-test-disable-framework" value="false"/>
         <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"/>

radio/V1_1/build/Android.bp

diff --git a/radio/V1_1/build/Android.bp b/radio/V1_1/build/Android.bp
index 4390c9a..e64b633 100644
--- a/radio/V1_1/build/Android.bp
+++ b/radio/V1_1/build/Android.bp
@@ -11,6 +11,7 @@
         "android/hardware/radio/1.1/Radio.vts",
         "android/hardware/radio/1.1/RadioIndication.vts",
         "android/hardware/radio/1.1/RadioResponse.vts",
+        "android/hardware/radio/1.1/types.vts",
     ],
 }
 
@@ -26,6 +27,7 @@
         "android/hardware/radio/1.1/Radio.vts.cpp",
         "android/hardware/radio/1.1/RadioIndication.vts.cpp",
         "android/hardware/radio/1.1/RadioResponse.vts.cpp",
+        "android/hardware/radio/1.1/types.vts.cpp",
     ],
 }
 
@@ -40,6 +42,7 @@
         "android/hardware/radio/1.1/Radio.vts.h",
         "android/hardware/radio/1.1/RadioIndication.vts.h",
         "android/hardware/radio/1.1/RadioResponse.vts.h",
+        "android/hardware/radio/1.1/types.vts.h",
     ],
 }
 
@@ -97,6 +100,7 @@
         "android/hardware/radio/1.1/Radio.vts.cpp",
         "android/hardware/radio/1.1/RadioIndication.vts.cpp",
         "android/hardware/radio/1.1/RadioResponse.vts.cpp",
+        "android/hardware/radio/1.1/types.vts.cpp",
     ],
 }
 
@@ -111,6 +115,7 @@
         "android/hardware/radio/1.1/Radio.vts.h",
         "android/hardware/radio/1.1/RadioIndication.vts.h",
         "android/hardware/radio/1.1/RadioResponse.vts.h",
+        "android/hardware/radio/1.1/types.vts.h",
     ],
 }
 

tests/libhwbinder/V1_0/build/Android.bp

diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index 116bfcc..0d48e70 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -9,6 +9,7 @@
     ],
     out: [
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts",
+        "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts",
     ],
 }
 
@@ -22,6 +23,7 @@
     ],
     out: [
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.cpp",
+        "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.cpp",
     ],
 }
 
@@ -34,6 +36,7 @@
     ],
     out: [
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.h",
+        "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.h",
     ],
 }
 
@@ -87,6 +90,7 @@
     ],
     out: [
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.cpp",
+        "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.cpp",
     ],
 }
 
@@ -99,6 +103,7 @@
     ],
     out: [
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.h",
+        "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.h",
     ],
 }