From bdc0578df1b8df4d61d412df00be896ba3434068 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 9 Aug 2023 14:51:13 -0700 Subject: Re-enable checks that pass in udc-dev-plus-aosp and downstream Re-enable ForegroundServiceType and MutableImplicitPendingIntent, which have been fixed in udc-dev-plus-aosp and downstream. Bug: 294098365 Test: treehugger Ignore-AOSP-First: re-enabling checks that fail in AOSP Change-Id: Ifa581e8d346cf7e70387d6aa3135203d6a7d621b --- java/lint_defaults.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java') diff --git a/java/lint_defaults.txt b/java/lint_defaults.txt index 8494d029e..a4dbb17e4 100644 --- a/java/lint_defaults.txt +++ b/java/lint_defaults.txt @@ -123,10 +123,6 @@ --warning_check SupportAnnotationUsage --warning_check UniqueConstants -# TODO(b/294098365): these checks fail in AOSP, but pass downstream ---warning_check ForegroundServiceType ---warning_check MutableImplicitPendingIntent - --warning_check ExactAlarm --warning_check ExpiredTargetSdkVersion --warning_check ForegroundServicePermission -- cgit v1.2.3-59-g8ed1b From 58c2388f92ba65240048450372eb4754c5ea5920 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 16 Aug 2023 08:04:26 +0000 Subject: Revert "Re-enable checks that pass in udc-dev-plus-aosp and downstream" This reverts commit bdc0578df1b8df4d61d412df00be896ba3434068. Reason for revert: b/296088866 Change-Id: I053314736758f48ea99920a141443c1489d2477b --- java/lint_defaults.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java') diff --git a/java/lint_defaults.txt b/java/lint_defaults.txt index a4dbb17e4..8494d029e 100644 --- a/java/lint_defaults.txt +++ b/java/lint_defaults.txt @@ -123,6 +123,10 @@ --warning_check SupportAnnotationUsage --warning_check UniqueConstants +# TODO(b/294098365): these checks fail in AOSP, but pass downstream +--warning_check ForegroundServiceType +--warning_check MutableImplicitPendingIntent + --warning_check ExactAlarm --warning_check ExpiredTargetSdkVersion --warning_check ForegroundServicePermission -- cgit v1.2.3-59-g8ed1b From 7b9c1e906542ba1abf9d55cae4e8dc503d55bd16 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 22 Aug 2023 18:33:58 +0000 Subject: Reland: Re-enable checks that pass in udc-dev-plus-aosp and downstream This relands Ifa581e8d346cf7e70387d6aa3135203d6a7d621b after fixes to the manifests of modules that didn't pass the new lint checks. Bug: 294098365 Test: treehugger Test: https://android-build.googleplex.com/builds/abtd/run/L56200000962810233 Test: https://android-build.googleplex.com/builds/abtd/run/L49700000962810033 Change-Id: I82129ef29025f35c0f4fc20f2d892c0af39d76ae --- java/lint_defaults.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java') diff --git a/java/lint_defaults.txt b/java/lint_defaults.txt index 8494d029e..a4dbb17e4 100644 --- a/java/lint_defaults.txt +++ b/java/lint_defaults.txt @@ -123,10 +123,6 @@ --warning_check SupportAnnotationUsage --warning_check UniqueConstants -# TODO(b/294098365): these checks fail in AOSP, but pass downstream ---warning_check ForegroundServiceType ---warning_check MutableImplicitPendingIntent - --warning_check ExactAlarm --warning_check ExpiredTargetSdkVersion --warning_check ForegroundServicePermission -- cgit v1.2.3-59-g8ed1b From 818f3d948595bc6e43ef4aa033fafb6584315cd7 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 22 Sep 2023 00:28:20 +0000 Subject: RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp This change was already submitted with https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22 but was never propagated to downstream. Ignore-AOSP-First: change already merged in aosp Test: m nothing --build-from-text-stub Change-Id: I1f2f33e1a5df6f7b8f8215ab41b41228fa873ea1 --- java/core-libraries/Android.bp | 54 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp index de9a82d09..4380f4f5c 100644 --- a/java/core-libraries/Android.bp +++ b/java/core-libraries/Android.bp @@ -55,6 +55,19 @@ java_library { ], } +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_library { name: "core.current.stubs", defaults: [ @@ -153,7 +166,6 @@ java_defaults { system_modules: "none", } - // A stubs target containing the parts of the public SDK & @SystemApi(MODULE_LIBRARIES) API // provided by the core libraries. // @@ -265,6 +277,32 @@ java_library { ], } +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 { + 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_library { name: "legacy.core.platform.api.stubs", visibility: core_platform_visibility, @@ -328,6 +366,20 @@ java_library { ], } +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", + ], +} + java_library { name: "stable.core.platform.api.stubs", visibility: core_platform_visibility, -- cgit v1.2.3-59-g8ed1b