diff options
| author | 2022-06-24 19:36:58 +0000 | |
|---|---|---|
| committer | 2022-06-24 19:36:58 +0000 | |
| commit | b103f0d765e7b3ba79bbf843ca855faa03ccd5c7 (patch) | |
| tree | 6ae44a01aaee888407f1ac735f14458ef730510b /api/Android.bp | |
| parent | 1c88dd6b6da86ed6cd776d1f3489d892c3ac3cfe (diff) | |
| parent | 035a929561345aa06025657344757b93c2ed42c5 (diff) | |
Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126
Change-Id: I1069faa26c031375b8ffb3700c9c8ceb156cbfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/Android.bp')
| -rw-r--r-- | api/Android.bp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/api/Android.bp b/api/Android.bp index 72ac427380e6..9fb7b35605b8 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -195,12 +195,8 @@ genrule { // This produces the same annotations.zip as framework-doc-stubs, but by using // outputs from individual modules instead of all the source code. -genrule { - name: "sdk-annotations.zip", - srcs: [ - ":android-non-updatable-doc-stubs{.annotations.zip}", - ":all-modules-public-annotations", - ], +genrule_defaults { + name: "sdk-annotations-defaults", out: ["annotations.zip"], tools: [ "merge_annotation_zips", @@ -211,6 +207,24 @@ genrule { } genrule { + name: "sdk-annotations.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs{.annotations.zip}", + ":all-modules-public-annotations", + ], +} + +genrule { + name: "sdk-annotations-system.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs-system{.annotations.zip}", + ":all-modules-system-annotations", + ], +} + +genrule { name: "combined-removed-dex", visibility: [ "//frameworks/base/boot", |