add component metadata to all CTS module configs
Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: Id856f93c0d2a018be65bff33459b4b703d23257d
diff --git a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
index ade4fac..d96f8f7 100644
--- a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest902DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
index 1390840..06d69a6 100644
--- a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest903DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
index f16ce94..ad53276 100644
--- a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest904DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
index c337e82..b6144a3 100644
--- a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest905DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
index dbd74f6..6116e8e 100644
--- a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest906DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
index 99cd40d..272f0c7 100644
--- a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest907DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
index fca6567..5d5b3f2 100644
--- a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest908DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
index a947621..cd8b9dc 100644
--- a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest910DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
index fb06812..aeb6aa6 100644
--- a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest911DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
index a019d07..c23f675 100644
--- a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest913DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
index b70869e..6e75f0e 100644
--- a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest914DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
index 35f9903..443b3fc 100644
--- a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest915DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
index ad988af..de1bbc0 100644
--- a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest917DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
index 4a3feb1..9a99730 100644
--- a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest918DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
index 3183ad3..9c18d06 100644
--- a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest919DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
index ba53a64..ae28aed 100644
--- a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest920DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
index 2b74f07..94414ec 100644
--- a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest922DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
index 9c8aa21..f5d6f38 100644
--- a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest923DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
index 5a2b567..2315efe 100644
--- a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest924DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
index eea4602..f2cbeb4 100644
--- a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest926DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
index 71d452d..5601063 100644
--- a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest927DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
index b7c59de..d1a476b 100644
--- a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest928DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
index 3b241b2..24250ea 100644
--- a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest930DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
index 4944067..8cb989a 100644
--- a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest931DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
index b6b1574..ccd360a 100644
--- a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest932DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
index 56ebc24..bc0158d 100644
--- a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest940DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
index ffe2bf4..c7420fe 100644
--- a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest942DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
index c772bfb..b45feaf 100644
--- a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest944DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
index 431c5e6..e3cf952 100644
--- a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest945DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
index 4ab0c9a..283cdfd 100644
--- a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest947DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
index b489635..d91c141 100644
--- a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest951DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
index 3e2bb67..20cd0a9 100644
--- a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest981DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
index 7c4833f..b2b68c2 100644
--- a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest982DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
index 7ba284c..4204ffe 100644
--- a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest984DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
index ba21091..57d9e8b 100644
--- a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest985DeviceApp.apk" />
diff --git a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
index 4bc581f..7a74d32 100644
--- a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for CTS JVMTI test cases">
+ <option name="config-descriptor:metadata" key="component" value="art" />
<target_preparer class="android.jvmti.cts.JvmtiPreparer">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsJvmtiRunTest986DeviceApp.apk" />