From 81af1f503c332638316e45e374105d9f05134fe1 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 8 Apr 2021 19:22:50 +0100
Subject: [PATCH] Move global hidden API flags generation to
 platform_bootclasspath

The global hidden API flags generation has moved from the singleton to
the platform_bootclasspath module type so this change provides the
paths to the additional hidden API flag configuration as part of the
definition of the platform-bootclasspath module.

Bug: 177892522
Test: verified that the out/soong/hiddenapi/... files are unchanged
      by this change
Change-Id: Id82b45d2abd6ca2efcfd730689b1eda92d55978e
---
 api/Android.bp  |  3 +++
 boot/Android.bp | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/api/Android.bp b/api/Android.bp
index 485255f32537e..6e83c083245ac 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 71edea27ada67..8f6e5915bc25f 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",
+        ],
+    },
 }