commit a81ea29d7f8b9de919f6b1c3781f7798f13172fb
author Anton Hansson <hansson@google.com> Tue Oct 24 10:06:54 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 24 10:06:54 2023 +0000
tree 9f48bb844a8fd309fe25d011896462dc083687a6
parent d3c5bea1e1ca19ccb0ce080b0334f3cf2f798344
parent e35b1384812f82f2c7a75494c83b96c9b39e3c46

Merge "SdkTestCore for non-updatable modules" into main

api/StubLibraries.bp

diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp
index 4f2a182..27a462e 100644
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
@@ -523,6 +523,22 @@
 }
 
 java_library {
+    name: "android_test_frameworks_core_stubs_current.from-source",
+    static_libs: [
+        "all-updatable-modules-system-stubs",
+        "android-non-updatable.stubs.test",
+        "private-stub-annotations-jar",
+    ],
+    defaults: [
+        "android.jar_defaults",
+        "android_stubs_dists_default",
+    ],
+    dist: {
+        dir: "apistubs/android/test-core",
+    },
+}
+
+java_library {
     name: "android_module_lib_stubs_current.from-source",
     defaults: [
         "android.jar_defaults",

api/api.go

diff --git a/api/api.go b/api/api.go
index 692d38f..738cf3a 100644
--- a/api/api.go
+++ b/api/api.go
@@ -393,6 +393,7 @@
 		"android_stubs_current",
 		"android_system_stubs_current",
 		"android_test_stubs_current",
+		"android_test_frameworks_core_stubs_current",
 		"android_module_lib_stubs_current",
 		"android_system_server_stubs_current",
 	}