From e35b1384812f82f2c7a75494c83b96c9b39e3c46 Mon Sep 17 00:00:00 2001 From: Mark White Date: Sat, 12 Aug 2023 01:31:26 +0000 Subject: SdkTestCore for non-updatable modules Provides SdkTestCore/test_core_current sdk_version for non-updatable modules that have their test scope dependent on test apis from framework-minus-apex. Ignore-AOSP-First: Change in topic with internal-first projects Bug: 289776578 Test: m checkapi Merged-In: I855346c01bb609e81b14dbdc13330315badc339e Change-Id: I855346c01bb609e81b14dbdc13330315badc339e --- api/StubLibraries.bp | 16 ++++++++++++++++ api/api.go | 1 + 2 files changed, 17 insertions(+) diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index ada4b1a9cba5..55a666a98717 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -520,6 +520,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: [ 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", } -- cgit v1.2.3-59-g8ed1b