diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-12 20:08:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 20:08:58 +0000 |
| commit | 78f9593ff7ac6358e3f6a2b76f9654af0da0ac7c (patch) | |
| tree | 931d388be2e8bfea13121c465eb08d90e278f383 | |
| parent | b778e99951529713c8452102f9fdb9e88e272949 (diff) | |
| parent | 72b1ff135f5d8939a261999aaea47636a29c1718 (diff) | |
Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845
Change-Id: I79c9c1803ac53db9966646436f9b1c329595ae8e
| -rw-r--r-- | api/Android.bp | 3 | ||||
| -rw-r--r-- | boot/Android.bp | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp index 485255f32537..6e83c083245a 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -308,6 +308,9 @@ genrule { genrule { name: "combined-removed-dex", + visibility: [ + "//frameworks/base/boot", + ], srcs: [ ":frameworks-base-api-removed.txt", ":frameworks-base-api-system-removed.txt", diff --git a/boot/Android.bp b/boot/Android.bp index 71edea27ada6..8f6e5915bc25 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -43,4 +43,32 @@ package { // done correctly. platform_bootclasspath { name: "platform-bootclasspath", + + // Additional information needed by hidden api processing. + hidden_api: { + unsupported: [ + "hiddenapi/hiddenapi-unsupported.txt", + ], + removed: [ + ":combined-removed-dex", + ], + max_target_r_low_priority: [ + "hiddenapi/hiddenapi-max-target-r-loprio.txt", + ], + max_target_q: [ + "hiddenapi/hiddenapi-max-target-q.txt", + ], + max_target_p: [ + "hiddenapi/hiddenapi-max-target-p.txt", + ], + max_target_o_low_priority: [ + "hiddenapi/hiddenapi-max-target-o.txt", + ], + blocked: [ + "hiddenapi/hiddenapi-force-blocked.txt", + ], + unsupported_packages: [ + "hiddenapi/hiddenapi-unsupported-packages.txt", + ], + }, } |