Merge "Only run MicrodroidTestApp.GTS on devices with SDK >= 34" into main
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 806592d..e342f60 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -58,7 +58,8 @@
// Non-VM payload libraries
"libhwtrust_jni",
],
- min_sdk_version: "33",
+ // AVF java APIs were introduced in Android U.
+ min_sdk_version: "34",
}
DATA = [
diff --git a/tests/testapk/AndroidTestTemplate.xml b/tests/testapk/AndroidTestTemplate.xml
index 6cdf984..6a03b64 100644
--- a/tests/testapk/AndroidTestTemplate.xml
+++ b/tests/testapk/AndroidTestTemplate.xml
@@ -42,6 +42,9 @@
<!-- Controller that will skip the module if a native bridge situation is detected -->
<!-- For example: module wants to run arm and device is x86 -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" />
+ <!-- Test only needs to run on Android U (SDK 34) and above -->
+ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk34ModuleController" />
+
{EXTRA_CONFIGS}
</configuration>