From dadbc58d52b0cb244f4d8cb99a79c118ab137798 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 30 Oct 2023 12:17:25 +0000 Subject: Move aconfig-srcjars srcs into shared defaults This ensures they're consistently added to all droidstubs modules for the non-updatable part. Test: presubmit Change-Id: Ia17808572b3fa8d75cdc71e7981d562ad0036afc --- Android.bp | 1 + api/StubLibraries.bp | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Android.bp b/Android.bp index 9c2b47184bdc..1d11014a6c54 100644 --- a/Android.bp +++ b/Android.bp @@ -620,6 +620,7 @@ filegroup { name: "android-non-updatable-stub-sources", srcs: [ ":framework-mime-sources", // mimemap builds separately but has no separate droidstubs. + ":framework-minus-apex-aconfig-srcjars", ":framework-non-updatable-sources", ":opt-telephony-srcs", ":opt-net-voip-srcs", diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index d566552333cb..5688b968db87 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -29,9 +29,6 @@ droidstubs { name: "api-stubs-docs-non-updatable", - srcs: [ - ":framework-minus-apex-aconfig-srcjars", - ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", @@ -91,9 +88,6 @@ module_libs = [ droidstubs { name: "system-api-stubs-docs-non-updatable", - srcs: [ - ":framework-minus-apex-aconfig-srcjars", - ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", @@ -134,9 +128,6 @@ droidstubs { droidstubs { name: "test-api-stubs-docs-non-updatable", - srcs: [ - ":framework-minus-apex-aconfig-srcjars", - ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", @@ -184,9 +175,6 @@ droidstubs { droidstubs { name: "module-lib-api-stubs-docs-non-updatable", - srcs: [ - ":framework-minus-apex-aconfig-srcjars", - ], defaults: [ "android-non-updatable-stubs-defaults", "module-classpath-stubs-defaults", -- cgit v1.2.3-59-g8ed1b