From f4341bb38120f1fa82dd12525190820b2f8e8662 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 30 Jun 2021 22:18:24 +0100 Subject: Replace ART's core-platform-api stub with module-lib stubs The stub should be identical now, and thus replacing it should cause no behavior change. Bug: 192645954 Bug: 192446466 Test: m droid Merged-In: Ia44f51aa4676e94c4ecd985ba98e29481baca533 Change-Id: Ia44f51aa4676e94c4ecd985ba98e29481baca533 --- JavaLibrary.bp | 17 +++++ mmodules/core_platform_api/Android.bp | 131 +--------------------------------- 2 files changed, 19 insertions(+), 129 deletions(-) diff --git a/JavaLibrary.bp b/JavaLibrary.bp index 6e1a87191fd..dcbff3b5dfd 100644 --- a/JavaLibrary.bp +++ b/JavaLibrary.bp @@ -883,6 +883,7 @@ java_sdk_library { name: "art.module.public.api", visibility: [ "//art/build/sdk", + "//libcore/mmodules/core_platform_api", "//frameworks/base", "//frameworks/base/api", ], @@ -997,6 +998,22 @@ java_system_modules { ], } +// Used when compiling higher-level code against art.module.public.api.stubs.module_lib. +// +// This is only intended for use within core libraries and must not be used +// from outside. +java_system_modules { + name: "art-module-lib-api-stubs-system-modules", + visibility: [ + "//art/build/sdk", + "//external/conscrypt", + "//external/icu/android_icu4j", + ], + libs: [ + "art.module.public.api.stubs.module_lib", + ], +} + // A stubs target containing the parts of the public SDK API provided by the // core library. // diff --git a/mmodules/core_platform_api/Android.bp b/mmodules/core_platform_api/Android.bp index d7988ea60f7..7036aba75c5 100644 --- a/mmodules/core_platform_api/Android.bp +++ b/mmodules/core_platform_api/Android.bp @@ -41,133 +41,6 @@ package { default_applicable_licenses: ["libcore_license"], } -java_defaults { - name: "art-module-platform-api-defaults", - srcs: [ - ":art_module_api_files", - ], - api_only: true, - droiddoc_options: [ - "--hide HiddenSuperclass", - "--hide-annotation libcore.api.Hide", - "--skip-annotation-instance-methods=false", - "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* ", - ], - merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"], - - // Emit nullability annotations from the source to the stub files. - annotations_enabled: true, - - merge_annotations_dirs: [ - "metalava-manual", - "ojluni-annotated-sdk-stubs", - ], - - sdk_version: "none", - system_modules: "none", - patch_module: "java.base", - dist_group: "android", - unsafe_ignore_missing_latest_api: true, -} - -// Referenced implicitly from legacy.art.module.platform.api. -filegroup { - name: "legacy.art.module.platform.api.api.public.latest", - srcs: [ - "api/legacy_platform/last-api.txt", - ], -} - -// Referenced implicitly from legacy.art.module.platform.api. -filegroup { - name: "legacy.art.module.platform.api-removed.api.public.latest", - srcs: [ - "api/legacy_platform/last-removed.txt", - ], -} - -// Referenced implicitly from legacy.art.module.platform.api. -filegroup { - name: "legacy.art.module.platform.api-incompatibilities.api.public.latest", - srcs: [ - "api/legacy_platform/last-incompatibilities.txt", - ], -} - -java_sdk_library { - name: "legacy.art.module.platform.api", - defaults: ["art-module-platform-api-defaults"], - api_dir: "api/legacy_platform", - droiddoc_options: [ - "--show-single-annotation libcore.api.CorePlatformApi", - ], - - // Make dex jars for the stubs available for use by hiddenapi processing. - compile_dex: true, - dist_stem: "art-coreplatform-legacy", -} - -// Referenced implicitly from stable.art.module.platform.api. -filegroup { - name: "stable.art.module.platform.api.api.public.latest", - srcs: [ - "api/stable_platform/last-api.txt", - ], -} - -// Referenced implicitly from stable.art.module.platform.api. -filegroup { - name: "stable.art.module.platform.api-removed.api.public.latest", - srcs: [ - "api/stable_platform/last-removed.txt", - ], -} - -// Referenced implicitly from stable.art.module.platform.api. -filegroup { - name: "stable.art.module.platform.api-incompatibilities.api.public.latest", - srcs: [ - "api/stable_platform/last-incompatibilities.txt", - ], -} - -java_sdk_library { - name: "stable.art.module.platform.api", - defaults: ["art-module-platform-api-defaults"], - api_dir: "api/stable_platform", - droiddoc_options: [ - "--show-single-annotation libcore.api.CorePlatformApi\\(status=libcore.api.CorePlatformApi.Status.STABLE\\)", - ], - dist_stem: "art-coreplatform-stable", -} - -// Used when compiling higher-level code against *.core.platform.api.stubs. -java_system_modules { - name: "legacy-art-module-platform-api-stubs-system-modules", - visibility: [ - "//art/build/sdk", - "//external/conscrypt", - "//external/icu/android_icu4j", - "//external/wycheproof", - ], - libs: [ - "legacy.art.module.platform.api.stubs", - ], -} - -java_system_modules { - name: "stable-art-module-platform-api-stubs-system-modules", - visibility: [ - "//art/build/sdk", - "//external/conscrypt", - "//external/icu/android_icu4j", - "//external/wycheproof", - ], - libs: [ - "stable.art.module.platform.api.stubs", - ], -} - // Ideally this should be a restricted allowlist but there are hundreds of modules that depend on // this. // TODO(http://b/134561230) - limit the number of dependents on this. @@ -188,7 +61,7 @@ java_library { sdk_version: "none", system_modules: "none", static_libs: [ - "legacy.art.module.platform.api.stubs", + "art.module.public.api.stubs.module_lib", "conscrypt.module.platform.api.stubs", "legacy.i18n.module.platform.api.stubs", ], @@ -204,7 +77,7 @@ java_library { sdk_version: "none", system_modules: "none", static_libs: [ - "stable.art.module.platform.api.stubs", + "art.module.public.api.stubs.module_lib", // conscrypt only has a stable version, so it is okay to depend on it here: "conscrypt.module.platform.api.stubs", "stable.i18n.module.platform.api.stubs", -- cgit v1.2.3 From 7efd2b930167d6d13bd2a2f357f53cc04884f49f Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Fri, 25 Jun 2021 17:39:47 +0100 Subject: Update version code definitions Bug: 171506470 Ignore-AOSP-First: drops change not present in AOSP Test: TH Change-Id: Ic02149e33ced7230dbe0804ea07dbdc30bcde0c5 --- dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java | 4 ++-- mmodules/intracoreapi/api/intra/current.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java index c05ce06929a..9d4d3faaad1 100644 --- a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java +++ b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java @@ -67,8 +67,8 @@ public class VersionCodes { public static final int R = 30; /** - * The version code for Android S (API version TBD). + * The version code for Android S (API version 31). */ @IntraCoreApi - public static final int S = CUR_DEVELOPMENT; + public static final int S = 31; } diff --git a/mmodules/intracoreapi/api/intra/current.txt b/mmodules/intracoreapi/api/intra/current.txt index bc021cfcc85..7e813f9e243 100644 --- a/mmodules/intracoreapi/api/intra/current.txt +++ b/mmodules/intracoreapi/api/intra/current.txt @@ -35,7 +35,7 @@ package dalvik.annotation.compat { field @libcore.api.IntraCoreApi public static final int P = 28; // 0x1c field @libcore.api.IntraCoreApi public static final int Q = 29; // 0x1d field @libcore.api.IntraCoreApi public static final int R = 30; // 0x1e - field @libcore.api.IntraCoreApi public static final int S = 10000; // 0x2710 + field @libcore.api.IntraCoreApi public static final int S = 31; // 0x1f } } -- cgit v1.2.3