From ba0a3aee9117c773af4c1034bc1eaca084a71f18 Mon Sep 17 00:00:00 2001 From: Mark White Date: Wed, 9 Aug 2023 21:49:04 +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 Change-Id: I8017384034d05f8d5ffb9d41eff111cd9fd1ec61 --- apis/Android.bp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/apis/Android.bp b/apis/Android.bp index 389a246..2e148aa 100644 --- a/apis/Android.bp +++ b/apis/Android.bp @@ -44,6 +44,14 @@ java_defaults { ], } +java_defaults { + name: "android_test_frameworks_core_stubs_current_contributions", + api_surface: "test", + api_contributions: [ + "test-api-stubs-docs-non-updatable.api.contribution", + ], +} + java_defaults { name: "android_module_lib_stubs_current_contributions", api_surface: "module-lib", @@ -118,6 +126,21 @@ java_api_library { ], } +java_api_library { + name: "android_test_frameworks_core_stubs_current.from-text", + api_surface: "test", + defaults: [ + "android_stubs_current_contributions", + "android_system_stubs_current_contributions", + "android_test_frameworks_core_stubs_current_contributions", + "stub-annotation-defaults", + ], + api_contributions: [ + "api-stubs-docs-non-updatable.api.contribution", + "system-api-stubs-docs-non-updatable.api.contribution", + ], +} + java_api_library { name: "android_module_lib_stubs_current_full.from-text", api_surface: "module-lib", -- cgit v1.2.3 From d128ff35f31be91f1cdbb7e939e247baf795b984 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Wed, 16 Aug 2023 19:06:25 +0000 Subject: Move java_api_library modules to f/b/api/StubLibraries.bp This change moves the full api surface stub jar generating java_api_library module definitions from build/orchestrator to frameworks/base, in order to resolve missing dependency build failure for partial repos and move the modules closer to their .from-source equivalents. Ignore-AOSP-First: Resolve merge conflict Test: m --build-from-text-stub Bug: 290996110 (cherry picked from https://android-review.googlesource.com/q/commit:9dfc48f546c3c208b08c777ed933b739f801caab) Change-Id: I296cdd5e9e10d86d117bf5516a4fcee029d5ea89 --- apis/Android.bp | 228 -------------------------------------------------------- 1 file changed, 228 deletions(-) delete mode 100644 apis/Android.bp diff --git a/apis/Android.bp b/apis/Android.bp deleted file mode 100644 index 2e148aa..0000000 --- a/apis/Android.bp +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright 2023 Google Inc. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -// -// Java API defaults and libraries for single tree build -// - -java_defaults { - name: "stub-annotation-defaults", - libs: [ - "stub-annotations", - ], - static_libs: [ - // stub annotations do not contribute to the API surfaces but are statically - // linked in the stubs for API surfaces (see frameworks/base/StubLibraries.bp). - // This is because annotation processors insist on loading the classes for any - // annotations found, thus should exist inside android.jar. - "private-stub-annotations-jar", - ], -} - -// Listing of API domains contribution and dependencies per API surfaces -java_defaults { - name: "android_test_stubs_current_contributions", - api_surface: "test", - api_contributions: [ - "test-api-stubs-docs-non-updatable.api.contribution", - "framework-virtualization.stubs.source.test.api.contribution", - ], -} - -java_defaults { - name: "android_test_frameworks_core_stubs_current_contributions", - api_surface: "test", - api_contributions: [ - "test-api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_defaults { - name: "android_module_lib_stubs_current_contributions", - api_surface: "module-lib", - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - "system-api-stubs-docs-non-updatable.api.contribution", - "module-lib-api-stubs-docs-non-updatable.api.contribution", - "art.module.public.api.stubs.source.api.contribution", - "art.module.public.api.stubs.source.system.api.contribution", - "art.module.public.api.stubs.source.module_lib.api.contribution", - "i18n.module.public.api.stubs.source.api.contribution", - "i18n.module.public.api.stubs.source.system.api.contribution", - "i18n.module.public.api.stubs.source.module_lib.api.contribution", - ], -} - -java_defaults { - name: "android_core_platform_stubs_current_contributions", - api_surface: "core_platform", - api_contributions: [ - "art.module.public.api.stubs.source.api.contribution", - "art.module.public.api.stubs.source.system.api.contribution", - "art.module.public.api.stubs.source.module_lib.api.contribution", - "conscrypt.module.platform.api.stubs.source.api.contribution", - "i18n.module.public.api.stubs.source.api.contribution", - ], -} - -// Java API library definitions per API surface -java_api_library { - name: "android_stubs_current.from-text", - api_surface: "public", - defaults: [ - // This module is dynamically created at frameworks/base/api/api.go - // instead of being written out, in order to minimize edits in the codebase - // when there is a change in the list of modules. - // that contributes to an api surface. - "android_stubs_current_contributions", - "stub-annotation-defaults", - ], - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_api_library { - name: "android_system_stubs_current.from-text", - api_surface: "system", - defaults: [ - "android_stubs_current_contributions", - "android_system_stubs_current_contributions", - "stub-annotation-defaults", - ], - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - "system-api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_api_library { - name: "android_test_stubs_current.from-text", - api_surface: "test", - defaults: [ - "android_stubs_current_contributions", - "android_system_stubs_current_contributions", - "android_test_stubs_current_contributions", - "stub-annotation-defaults", - ], - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - "system-api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_api_library { - name: "android_test_frameworks_core_stubs_current.from-text", - api_surface: "test", - defaults: [ - "android_stubs_current_contributions", - "android_system_stubs_current_contributions", - "android_test_frameworks_core_stubs_current_contributions", - "stub-annotation-defaults", - ], - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - "system-api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_api_library { - name: "android_module_lib_stubs_current_full.from-text", - api_surface: "module-lib", - defaults: [ - "android_stubs_current_contributions", - "android_system_stubs_current_contributions", - "android_module_lib_stubs_current_contributions_full", - ], - libs: [ - "stub-annotations", - ], - api_contributions: [ - "api-stubs-docs-non-updatable.api.contribution", - "system-api-stubs-docs-non-updatable.api.contribution", - "module-lib-api-stubs-docs-non-updatable.api.contribution", - ], -} - -java_api_library { - name: "android_module_lib_stubs_current.from-text", - api_surface: "module-lib", - defaults: [ - "android_module_lib_stubs_current_contributions", - ], - libs: [ - "android_module_lib_stubs_current_full.from-text", - "stub-annotations", - ], -} - -java_api_library { - name: "android_system_server_stubs_current.from-text", - api_surface: "system-server", - api_contributions: [ - "services-non-updatable-stubs.api.contribution", - ], - libs: [ - "android_module_lib_stubs_current.from-text", - "stub-annotations", - ], - static_libs: [ - "android_module_lib_stubs_current.from-text", - ], -} - -java_api_library { - name: "core.current.stubs.from-text", - api_surface: "core", - api_contributions: [ - "art.module.public.api.stubs.source.api.contribution", - "conscrypt.module.public.api.stubs.source.api.contribution", - "i18n.module.public.api.stubs.source.api.contribution", - ], - libs: [ - "stub-annotations", - ], -} - -java_api_library { - name: "legacy.core.platform.api.stubs.from-text", - api_surface: "core_platform", - defaults: [ - "android_core_platform_stubs_current_contributions", - ], - api_contributions: [ - "legacy.i18n.module.platform.api.stubs.source.api.contribution", - ], - libs: [ - "stub-annotations", - ], -} - -java_api_library { - name: "stable.core.platform.api.stubs.from-text", - api_surface: "core_platform", - defaults: [ - "android_core_platform_stubs_current_contributions", - ], - api_contributions: [ - "stable.i18n.module.platform.api.stubs.source.api.contribution", - ], - libs: [ - "stub-annotations", - ], -} -- cgit v1.2.3