diff options
| author | Anton Hansson <hansson@google.com> | 2021-01-21 14:02:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 14:02:57 +0000 |
| commit | f118549ef73d9d0a1c04cec5f32114af25540bcd (patch) | |
| tree | 1326b0f802ecfe5b880ba8cb8799054884418397 | |
| parent | 17d13191a16c6699e8f792d7b719634ac6e5c13c (diff) | |
| parent | 5e4e7ceca947cde3faab4cb268a361f99c74c9e3 (diff) | |
Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a am: 5e4e7ceca9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
| -rw-r--r-- | StubLibraries.bp | 73 | ||||
| -rw-r--r-- | api/Android.bp | 30 | ||||
| -rw-r--r-- | services/Android.bp | 19 |
3 files changed, 100 insertions, 22 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 3ff2546223de..665deda8aed1 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -123,6 +123,20 @@ droidstubs { new_since: ":android-non-updatable.api.public.latest", }, }, + dists: [ + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/public/api", + dest: "android-non-updatable.txt", + tag: ".api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/public/api", + dest: "android-non-updatable-removed.txt", + tag: ".removed-api.txt", + }, + ], } priv_apps = @@ -162,6 +176,20 @@ droidstubs { baseline_file: "core/api/system-lint-baseline.txt", }, }, + dists: [ + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system/api", + dest: "android-non-updatable.txt", + tag: ".api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system/api", + dest: "android-non-updatable-removed.txt", + tag: ".removed-api.txt", + }, + ], } droidstubs { @@ -178,11 +206,32 @@ droidstubs { baseline_file: "core/api/test-lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/test/api", - dest: "android.txt", - }, + dists: [ + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/test/api", + dest: "android.txt", + tag: ".api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/test/api", + dest: "removed.txt", + tag: ".removed-api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/test/api", + dest: "android-non-updatable.txt", + tag: ".api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/test/api", + dest: "android-non-updatable-removed.txt", + tag: ".removed-api.txt", + }, + ], } droidstubs { @@ -203,6 +252,20 @@ droidstubs { new_since: ":android-non-updatable.api.module-lib.latest", }, }, + dists: [ + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/module-lib/api", + dest: "android-non-updatable.txt", + tag: ".api.txt", + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/module-lib/api", + dest: "android-non-updatable-removed.txt", + tag: ".removed-api.txt", + }, + ], } ///////////////////////////////////////////////////////////////////// diff --git a/api/Android.bp b/api/Android.bp index 69f03b8d101c..1a58a16f3dc7 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -52,10 +52,7 @@ genrule { dest: "current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk", "win_sdk"], dir: "apistubs/android/public/api", dest: "android.txt", }, @@ -112,6 +109,11 @@ genrule { dir: "api", dest: "removed.txt", }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/public/api", + dest: "removed.txt", + }, ], } @@ -139,10 +141,7 @@ genrule { dest: "system-current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk", "win_sdk"], dir: "apistubs/android/system/api", dest: "android.txt", }, @@ -173,6 +172,11 @@ genrule { dir: "api", dest: "system-removed.txt", }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system/api", + dest: "removed.txt", + }, ], visibility: ["//visibility:public"], } @@ -201,10 +205,7 @@ genrule { dest: "module-lib-current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk", "win_sdk"], dir: "apistubs/android/module-lib/api", dest: "android.txt", }, @@ -234,6 +235,11 @@ genrule { dir: "api", dest: "module-lib-removed.txt", }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/module-lib/api", + dest: "removed.txt", + }, ], } diff --git a/services/Android.bp b/services/Android.bp index da24719c0f68..b11a2e8bfa4f 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -147,11 +147,20 @@ droidstubs { baseline_file: "api/lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/system-server/api", - dest: "android.txt", - }, + dists: [ + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system-server/api", + dest: "android.txt", + tag: ".api.txt" + }, + { + targets: ["sdk", "win_sdk"], + dir: "apistubs/android/system-server/api", + dest: "removed.txt", + tag: ".removed-api.txt", + }, + ] } java_library { |