diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-12 20:59:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 20:59:22 +0000 |
| commit | f5195618f89aa76a75df7f33d99775dc8bcc5c7a (patch) | |
| tree | 70e098bbc620d3a620e50d0d154619f63f6f62b0 | |
| parent | c5b6959fb922b430d48015c80f1e322b08f267ce (diff) | |
| parent | 78f9593ff7ac6358e3f6a2b76f9654af0da0ac7c (diff) | |
Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f am: 78f9593ff7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845
Change-Id: Ic3a1a3531016fa99e397a986bc05c2163d0f88bb
| -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 4baf7c1d5836..65712704f358 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -336,6 +336,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", + ], + }, } |