commit 8565755ed47587bb5de5ff9d43fb34161f043ecd
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 16 21:01:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 16 21:01:24 2019 +0000
tree 68f1aff0ba8b6ba7d989e4f0870679e4e014558c
parent abd2b6dcacca89b992aa9d15de05576bf07a275d
parent ce882bf46b7beb6b06c5e85c0b0da663f4ca0828

Merge "Pass in device serial number as an argument to fuzzy_fastboot testsuite" into qt-dev

tools/build/tasks/list/vts_test_bin_package_list.mk

diff --git a/tools/build/tasks/list/vts_test_bin_package_list.mk b/tools/build/tasks/list/vts_test_bin_package_list.mk
index f5c1e09..0b829c4 100644
--- a/tools/build/tasks/list/vts_test_bin_package_list.mk
+++ b/tools/build/tasks/list/vts_test_bin_package_list.mk
@@ -16,7 +16,9 @@
 vts_test_bin_packages := \
     android.hardware.tests.msgq@1.0-service-benchmark \
     android.hardware.tests.msgq@1.0-service-test \
+    fiemap_writer_test \
     fmq_test \
+    gsi_boot_test \
     hidl_test \
     hidl_test_client \
     hidl_test_helper \
@@ -107,3 +109,5 @@
     vts_halManifest_validate_test \
     vts_mediaCodecs_validate_test \
     vts_mediaProfiles_validate_test \
+    vts_defaultPermissions_validate_test \
+    vts_permission_validate_test \

tools/build/tasks/vts_package.mk

diff --git a/tools/build/tasks/vts_package.mk b/tools/build/tasks/vts_package.mk
index 39a8767..dd06a96 100644
--- a/tools/build/tasks/vts_package.mk
+++ b/tools/build/tasks/vts_package.mk
@@ -191,7 +191,9 @@
   system/libvintf/xsd/compatibilityMatrix/compatibility_matrix.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/compatibility_matrix.xsd \
   system/libvintf/xsd/halManifest/hal_manifest.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/hal_manifest.xsd \
   frameworks/av/media/libstagefright/xmlparser/media_codecs.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/media_codecs.xsd \
-  frameworks/av/media/libmedia/xsd/media_profiles.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/media_profiles.xsd
+  frameworks/av/media/libmedia/xsd/media_profiles.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/media_profiles.xsd \
+  frameworks/base/services/core/xsd/default-permissions.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/default-permissions.xsd \
+  frameworks/base/core/xsd/permission.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/permission.xsd
 
 include $(LOCAL_PATH)/framework/vtf_package.mk
 

tools/vts-tradefed/Android.mk

diff --git a/tools/vts-tradefed/Android.mk b/tools/vts-tradefed/Android.mk
index dab06d4..87f4a1e 100644
--- a/tools/vts-tradefed/Android.mk
+++ b/tools/vts-tradefed/Android.mk
@@ -24,7 +24,7 @@
 LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
 LOCAL_SUITE_NAME := VTS
 LOCAL_SUITE_FULLNAME := "Vendor Test Suite"
-LOCAL_SUITE_VERSION := 9.0_R6
+LOCAL_SUITE_VERSION := 9.0_R8
 LOCAL_STATIC_JAVA_LIBRARIES := \
     libvts_protos_host \