diff options
| author | Anton Hansson <hansson@google.com> | 2020-10-12 10:45:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-12 10:45:13 +0000 |
| commit | 99398da50615f15ab33abac542da983fa219f2c6 (patch) | |
| tree | a0d0b7afabcb9f974e22a71575a703375c91bd05 | |
| parent | 392b52f49f876c46ab8c13e82fdbddb6c9a71b3c (diff) | |
| parent | ae4332dc693cb7bd7a4c85b6553a23eca5ad67dd (diff) | |
Merge "Move the dist rules from monolithic to merged rules"
| -rw-r--r-- | StubLibraries.bp | 15 | ||||
| -rw-r--r-- | api/Android.bp | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 4e1de0ecf9d4..cf36bb072117 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -139,11 +139,6 @@ droidstubs { baseline_file: "api/lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/public/api", - dest: "android.txt", - }, jdiff_enabled: true, } @@ -206,11 +201,6 @@ droidstubs { baseline_file: "api/system-lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/system/api", - dest: "android.txt", - }, jdiff_enabled: true, } @@ -291,11 +281,6 @@ droidstubs { baseline_file: "api/module-lib-lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/module-lib/api", - dest: "android.txt", - }, } droidstubs { diff --git a/api/Android.bp b/api/Android.bp index ffc4a2146594..fd0303b31de9 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -60,6 +60,11 @@ genrule { out: ["current.txt"], tools: ["metalava"], cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/public/api", + dest: "android.txt", + }, } genrule { @@ -95,6 +100,11 @@ genrule { out: ["system-current.txt"], tools: ["metalava"], cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system/api", + dest: "android.txt", + }, } genrule { @@ -129,6 +139,11 @@ genrule { out: ["module-lib-current.txt"], tools: ["metalava"], cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", + dist: { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/module-lib/api", + dest: "android.txt", + }, } genrule { |