diff options
| author | 2023-10-24 10:28:33 +0000 | |
|---|---|---|
| committer | 2023-10-24 10:28:33 +0000 | |
| commit | 316dbb7cbb3584a4d5d6ad3629ae927f998917a9 (patch) | |
| tree | 2b638105f77e1ac9e5c2e93b63fbdd8838e64d98 | |
| parent | 958e23ea660fb07c6f5063b44f85a7dad216b83a (diff) | |
| parent | a81ea29d7f8b9de919f6b1c3781f7798f13172fb (diff) | |
Merge "SdkTestCore for non-updatable modules" into main am: a81ea29d7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799733
Change-Id: I77ac1a789a4b88bf9c9e64dd5236a9084a2e1f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/StubLibraries.bp | 16 | ||||
| -rw-r--r-- | api/api.go | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 4f2a182df4c9..27a462e48708 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -523,6 +523,22 @@ java_library { } 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", diff --git a/api/api.go b/api/api.go index 692d38fe21a2..738cf3ae5293 100644 --- a/api/api.go +++ b/api/api.go @@ -393,6 +393,7 @@ func createFullApiLibraries(ctx android.LoadHookContext) { "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", } |