commit 845a0edeafcf576fb9458c33942f3458bc9ea9f6
author Martin Stjernholm <mast@google.com> Thu Nov 17 23:27:20 2022 +0000
committer Martin Stjernholm <mast@google.com> Fri Nov 18 19:06:30 2022 +0000
tree 331da8800970ba0d77004ac61c0958dcabb8387f
parent e5f1d635677b297ca422fb981124fffa9386872c

Set sdk_version on all libs and apps installed by
libnativeloader_e2e_tests.

To make this test to work on platform releases S and later.

Test: atest libnativeloader_e2e_tests
  Check <uses-sdk> tags in a few built AndroidManifest.xml files.
Bug: 259544756
Change-Id: I8c6da8f997bc022441d71ce731d7ab9d32a12589

libnativeloader/test/Android.bp

diff --git a/libnativeloader/test/Android.bp b/libnativeloader/test/Android.bp
index 4276467..839397a 100644
--- a/libnativeloader/test/Android.bp
+++ b/libnativeloader/test/Android.bp
@@ -25,6 +25,7 @@
 
 cc_library {
     name: "libnativeloader_testlib",
+    sdk_version: "31",
     srcs: [],
     stl: "none",
 }
@@ -34,6 +35,7 @@
 android_test_helper_app {
     name: "library_container_app",
     defaults: ["art_module_source_build_java_defaults"],
+    sdk_version: "31",
     manifest: "library_container_app_manifest.xml",
     compile_multilib: "both",
     jni_libs: ["libnativeloader_testlib"],
@@ -41,6 +43,7 @@
 
 java_library {
     name: "loadlibrarytest_test_utils",
+    sdk_version: "31",
     static_libs: [
         "androidx.test.ext.junit",
         "androidx.test.ext.truth",
@@ -51,6 +54,7 @@
 // Test fixture that represents a shared library in /system/framework.
 java_library {
     name: "libnativeloader_system_shared_lib",
+    sdk_version: "31",
     installable: true,
     srcs: ["src/android/test/systemsharedlib/SystemSharedLib.java"],
 }
@@ -58,6 +62,7 @@
 // Test fixture that represents a shared library in /system_ext/framework.
 java_library {
     name: "libnativeloader_system_ext_shared_lib",
+    sdk_version: "31",
     installable: true,
     srcs: ["src/android/test/systemextsharedlib/SystemExtSharedLib.java"],
 }
@@ -66,7 +71,7 @@
 java_library {
     name: "libnativeloader_product_shared_lib",
     product_specific: true,
-    sdk_version: "33",
+    sdk_version: "31",
     installable: true,
     srcs: ["src/android/test/productsharedlib/ProductSharedLib.java"],
 }
@@ -75,7 +80,7 @@
 java_library {
     name: "libnativeloader_vendor_shared_lib",
     vendor: true,
-    sdk_version: "33",
+    sdk_version: "31",
     installable: true,
     srcs: ["src/android/test/vendorsharedlib/VendorSharedLib.java"],
 }
@@ -83,6 +88,7 @@
 java_defaults {
     name: "loadlibrarytest_app_defaults",
     defaults: ["art_module_source_build_java_defaults"],
+    sdk_version: "31",
     static_libs: [
         "androidx.test.ext.junit",
         "androidx.test.rules",