diff options
| author | Anton Hansson <hansson@google.com> | 2020-11-03 09:31:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-03 09:31:05 +0000 |
| commit | 2a8f6d002774226c23b600b34def48d18cd9fe2f (patch) | |
| tree | 5dfcbc550ec9e1cc83cc84c5375bc729e0140fd9 /api/Android.bp | |
| parent | fb8f388ce7dfd7c4a3c19415feb7c9a4f08e72fe (diff) | |
| parent | 1c4fab45a3b9a688324fb085717f7d818348d0c8 (diff) | |
Merge "Remove filegroups for *current.txt files"
Diffstat (limited to 'api/Android.bp')
| -rw-r--r-- | api/Android.bp | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/api/Android.bp b/api/Android.bp index 9f99b78c11c4..4d7f58edd870 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -16,25 +16,6 @@ package { default_visibility: ["//visibility:private"], } -// *-current.txt files for use by modules in other directories like cts -filegroup { - name: "frameworks-base-api-current.txt", - srcs: ["current.txt"], - visibility: ["//visibility:public"], -} - -filegroup { - name: "frameworks-base-api-system-current.txt", - srcs: ["system-current.txt"], - visibility: ["//visibility:public"], -} - -filegroup { - name: "frameworks-base-api-system-removed.txt", - srcs: ["system-removed.txt"], - visibility: ["//visibility:public"], -} - genrule { name: "current-api-xml", tools: ["metalava"], @@ -45,7 +26,7 @@ genrule { } genrule { - name: "frameworks-base-api-current-merged.txt", + name: "frameworks-base-api-current.txt", srcs: [ ":conscrypt.module.public.api{.public.api.txt}", ":framework-media{.public.api.txt}", @@ -72,10 +53,11 @@ genrule { dest: "android.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-removed-merged.txt", + name: "frameworks-base-api-removed.txt", srcs: [ ":conscrypt.module.public.api{.public.removed-api.txt}", ":framework-media{.public.removed-api.txt}", @@ -100,7 +82,7 @@ genrule { } genrule { - name: "frameworks-base-api-system-current-merged.txt", + name: "frameworks-base-api-system-current.txt", srcs: [ ":framework-media{.system.api.txt}", ":framework-mediaprovider{.system.api.txt}", @@ -126,10 +108,11 @@ genrule { dest: "android.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-system-removed-merged.txt", + name: "frameworks-base-api-system-removed.txt", srcs: [ ":framework-media{.system.removed-api.txt}", ":framework-mediaprovider{.system.removed-api.txt}", @@ -150,10 +133,11 @@ genrule { dest: "system-removed.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-module-lib-current-merged.txt", + name: "frameworks-base-api-module-lib-current.txt", srcs: [ ":framework-media{.module-lib.api.txt}", ":framework-mediaprovider{.module-lib.api.txt}", @@ -182,7 +166,7 @@ genrule { } genrule { - name: "frameworks-base-api-module-lib-removed-merged.txt", + name: "frameworks-base-api-module-lib-removed.txt", srcs: [ ":framework-media{.module-lib.removed-api.txt}", ":framework-mediaprovider{.module-lib.removed-api.txt}", @@ -208,8 +192,8 @@ genrule { genrule { name: "combined-removed-dex", srcs: [ - ":frameworks-base-api-removed-merged.txt", - ":frameworks-base-api-system-removed-merged.txt", + ":frameworks-base-api-removed.txt", + ":frameworks-base-api-system-removed.txt", ":android.car-stubs-docs{.removed-api.txt}", ":android.car-system-stubs-docs{.removed-api.txt}", ], |