Make test_framework-sdkextensions a separate jar with test classes.

Check updatable bootclasspath flow for adding new bootclasspath jars.
Instead of overwriting framework-sdkextensions, keep it as is and
install a new boot jar with test classes separately.

Bug: 180105615
Test: atest sdkextensions_classpaths_e2e_tests
Change-Id: Ib125299bf1fedfbac104e490bb6fb44623a1e9a0
Merged-In: Ib125299bf1fedfbac104e490bb6fb44623a1e9a0
(cherry picked from commit 2239417d8ae7da18984bbee5fda40b4871822e8f)

4 files changed, 23 insertions, 32 deletions

diff --git a/framework/Android.bp b/framework/Android.bp
index 3d3a500..253d840 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -33,23 +33,22 @@ filegroup {
     srcs: ["jarjar_rules.txt"],
 }
 
-java_defaults {
-    name: "framework-sdkextensions-defaults",
-    srcs: [":framework-sdkextensions-sources"],
+java_sdk_library {
+    name: "framework-sdkextensions",
     defaults: ["framework-module-defaults"],
+    srcs: [":framework-sdkextensions-sources"],
     permitted_packages: ["android.os.ext"],
     static_libs: ["modules-utils-build"],
     jarjar_rules: ":framework-sdkextensions-jarjar",
     min_sdk_version: "30",
-}
-
-java_sdk_library {
-    name: "framework-sdkextensions",
-    defaults: ["framework-sdkextensions-defaults"],
     lint: {
         strict_updatability_linting: true,
     },
+    impl_library_visibility: [
+        "//packages/modules/SdkExtensions/tests/e2e:__subpackages__",
+    ],
     apex_available: [
         "com.android.sdkext",
+        "test_com.android.sdkext",
     ],
 }
diff --git a/testing/Android.bp b/testing/Android.bp
index ed1834e..a20c286 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -45,7 +45,10 @@ apex_test {
 // bootclasspath.
 bootclasspath_fragment {
     name: "test_com.android.sdkext-bootclasspath-fragment",
-    contents: ["test_framework-sdkextensions"],
+    contents: [
+        "framework-sdkextensions",
+        "test_framework-sdkextensions",
+    ],
     apex_available: ["test_com.android.sdkext"],
 
     // The bootclasspath_fragments that provide APIs on which this depends.
@@ -94,39 +97,36 @@ prebuilt_etc {
 
 filegroup {
     name: "test_framework-sdkextensions-sources",
-    srcs: ["impl-src/**/*.java"],
+    srcs: ["impl-src/android/os/ext/test/Test.java"],
     path: "impl-src",
     visibility: [
-        "//frameworks/base",
         "//packages/modules/SdkExtensions:__subpackages__",
     ],
 }
 
 java_sdk_library {
     name: "test_framework-sdkextensions",
-    defaults: ["framework-sdkextensions-defaults"],
-    srcs: [
-        // Additional test library specific stuff.
-        ":test_framework-sdkextensions-sources",
-    ],
+    defaults: ["framework-module-defaults"],
+    srcs: [":test_framework-sdkextensions-sources"],
+    permitted_packages: ["android.os.ext.test"],
+    min_sdk_version: "30",
     apex_available: [
         "test_com.android.sdkext",
     ],
     impl_library_visibility: [
         "//packages/modules/SdkExtensions/tests/e2e:__subpackages__",
     ],
+    lint: {
+        strict_updatability_linting: true,
+    },
+
+    // Test only SDK, don't check against released APIs.
+    unsafe_ignore_missing_latest_api: true,
 
     // Output the api files to a special directory that won't trigger an API
     // review as it is a test only API.
     api_dir: "apis_for_tests",
 
-    stem: "framework-sdkextensions",
-
-    // Although this has a different name it is intended to be a later version
-    // of the framework-extensions module so verify its API against its
-    // previously released API.
-    dist_stem: "framework-sdkextensions",
-
     // Testing only.
     no_dist: true,
 }
diff --git a/testing/apis_for_tests/system-current.txt b/testing/apis_for_tests/system-current.txt
index 0f9a99e..fcf02f9 100644
--- a/testing/apis_for_tests/system-current.txt
+++ b/testing/apis_for_tests/system-current.txt
@@ -1,13 +1,4 @@
 // Signature format: 2.0
-package android.os.ext {
-
-  public class SdkExtensions {
-    method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
-    method public static int getExtensionVersion(int);
-  }
-
-}
-
 package android.os.ext.test {
 
   public class Test {
diff --git a/tests/e2e/Extensions/Android.bp b/tests/e2e/Extensions/Android.bp
index e77d91e..595a79b 100644
--- a/tests/e2e/Extensions/Android.bp
+++ b/tests/e2e/Extensions/Android.bp
@@ -41,6 +41,7 @@ android_test_helper_app {
     name: "sdkextensions_e2e_test_app",
     srcs: ["app-src/**/*.java"],
     libs: [
+        "framework-sdkextensions",
         // Depend on the impl library directly so that its tests can try and
         // invoke methods which it is not allowed to use to verify that the
         // runtime correctly refuses access to them.