diff options
| author | 2023-10-31 14:35:36 +0000 | |
|---|---|---|
| committer | 2023-10-31 14:35:36 +0000 | |
| commit | ce66cb06f4f86f8c80384010b2bcb080b2ac0d64 (patch) | |
| tree | 855f84aea52fdd83e9c75c08cacefbd8485de5f0 | |
| parent | 8e5b534e0637ac88adc5afa1adc9ba75ee8513e1 (diff) | |
| parent | 748fc971d2b4b7a0aa913249da9050e05f3a5cf5 (diff) | |
Merge "Move aconfig-srcjars srcs into shared defaults" into main am: 0a63944d29 am: 01aefbf28c am: 748fc971d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2809593
Change-Id: Iff2849808951d1b2d205720a39ded212fad5d6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | api/StubLibraries.bp | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp index b5f7e99c8823..49256ddb5cd4 100644 --- a/Android.bp +++ b/Android.bp @@ -631,6 +631,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", |