Merge "Remove libhwbinder/libhidltransport deps"
diff --git a/treble/vintf/Android.bp b/treble/vintf/Android.bp
index 5c45bef..9aaa8f8 100644
--- a/treble/vintf/Android.bp
+++ b/treble/vintf/Android.bp
@@ -71,7 +71,7 @@
name: "vts_treble_vintf_vendor_test",
//Use test_config for vts-core suite.
test_config: "vts_treble_vintf_vendor_test.xml",
- test_suites: ["vts-core"],
+ test_suites: ["vts-core", "device-tests"],
defaults: ["vts_treble_vintf_test_defaults"],
srcs: [
"DeviceManifestTest.cpp",
@@ -86,7 +86,7 @@
name: "vts_treble_vintf_framework_test",
//Use test_config for vts-core suite.
test_config: "vts_treble_vintf_framework_test.xml",
- test_suites: ["vts-core"],
+ test_suites: ["vts-core", "device-tests"],
defaults: ["vts_treble_vintf_test_defaults"],
srcs: [
"SingleManifestTest.cpp",
diff --git a/treble/vintf/vts_treble_vintf_framework_test.xml b/treble/vintf/vts_treble_vintf_framework_test.xml
index 83f9913..740719d 100644
--- a/treble/vintf/vts_treble_vintf_framework_test.xml
+++ b/treble/vintf/vts_treble_vintf_framework_test.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for vts_treble_vintf_framework_test">
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="vts_treble_vintf_framework_test->/data/local/tmp/vts_treble_vintf_framework_test" />
diff --git a/treble/vintf/vts_treble_vintf_test_o_mr1.xml b/treble/vintf/vts_treble_vintf_test_o_mr1.xml
index 7d50fcf..9f2f512 100644
--- a/treble/vintf/vts_treble_vintf_test_o_mr1.xml
+++ b/treble/vintf/vts_treble_vintf_test_o_mr1.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for vts_treble_vintf_test_o_mr1">
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="vts_treble_vintf_test_o_mr1->/data/local/tmp/vts_treble_vintf_test_o_mr1" />
diff --git a/treble/vintf/vts_treble_vintf_vendor_test.xml b/treble/vintf/vts_treble_vintf_vendor_test.xml
index 23515c5..c78e85a 100644
--- a/treble/vintf/vts_treble_vintf_vendor_test.xml
+++ b/treble/vintf/vts_treble_vintf_vendor_test.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for vts_treble_vintf_vendor_test">
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="vts_treble_vintf_vendor_test->/data/local/tmp/vts_treble_vintf_vendor_test" />
diff --git a/tv/tuner/V1_0/target/Android.bp b/tv/tuner/V1_0/target/Android.bp
new file mode 100644
index 0000000..7c67fc0
--- /dev/null
+++ b/tv/tuner/V1_0/target/Android.bp
@@ -0,0 +1,21 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This file is autogenerated by test/vts-testcase/hal/script/test_case_creator.py
+// DO NOT EDIT
+
+vts_config {
+ name: "VtsHalTvTunerV1_0Target",
+}
+
diff --git a/tv/tuner/V1_0/target/AndroidTest.xml b/tv/tuner/V1_0/target/AndroidTest.xml
new file mode 100644
index 0000000..442f458
--- /dev/null
+++ b/tv/tuner/V1_0/target/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS VtsHalTvTunerV1_0Target test cases">
+ <option key="plan" name="config-descriptor:metadata" value="vts-staging-default"/>
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetTest.push"/>
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsHalTvTunerV1_0Target"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalTvTunerV1_0TargetTest/VtsHalTvTunerV1_0TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalTvTunerV1_0TargetTest/VtsHalTvTunerV1_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="test-timeout" value="1m"/>
+ </test>
+</configuration>
