diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-12-11 10:50:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-11 10:50:29 +0000 |
| commit | 24c79cdb889b87138b1531d0997ad51993bc22c9 (patch) | |
| tree | 4e07e6078e8f4e4157fdb580fb5b13a5e194cfc3 /api | |
| parent | 9b1405c67694e31675cf09b797e2a6a81036b6d7 (diff) | |
| parent | f358ccece0630f4ea9f252d20616041438068efc (diff) | |
Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/api/Android.bp b/api/Android.bp index 5ee41b79b58c..9417030fc937 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -38,6 +38,7 @@ genrule { ":framework-statsd{.public.api.txt}", ":framework-tethering{.public.api.txt}", ":framework-wifi{.public.api.txt}", + ":i18n.module.public.api{.public.api.txt}", ":non-updatable-current.txt", ], out: ["current.txt"], @@ -50,7 +51,10 @@ genrule { dest: "current.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/public/api", dest: "android.txt", }, @@ -72,6 +76,7 @@ genrule { ":framework-statsd{.public.stubs.source}", ":framework-tethering{.public.stubs.source}", ":framework-wifi{.public.stubs.source}", + ":i18n.module.public.api{.public.stubs.source}", ], out: ["current.srcjar"], tools: ["merge_zips"], @@ -92,6 +97,7 @@ genrule { ":framework-statsd{.public.removed-api.txt}", ":framework-tethering{.public.removed-api.txt}", ":framework-wifi{.public.removed-api.txt}", + ":i18n.module.public.api{.public.removed-api.txt}", ":non-updatable-removed.txt", ], out: ["removed.txt"], @@ -130,7 +136,10 @@ genrule { dest: "system-current.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/system/api", dest: "android.txt", }, @@ -189,7 +198,10 @@ genrule { dest: "module-lib-current.txt", }, { - targets: ["sdk", "win_sdk"], + targets: [ + "sdk", + "win_sdk", + ], dir: "apistubs/android/module-lib/api", dest: "android.txt", }, |