commit 18f3747da53c97013dad36263d2c40a05464d4ba
author Yi-an Chen <theianchen@google.com> Mon Apr 22 17:16:59 2024 +0000
committer Yi-an Chen <theianchen@google.com> Wed May 22 17:54:28 2024 +0000
tree d67b9bc22c6ab0afa6206a2c43d9cfec16c1a360
parent 0e05178db11b308a11eae2f49429e529ebac9d0d

Migrate permission flags for base to be exported flags

Bug: 336313566
Test: All existing automation tests
Change-Id: Ia057172bba96397a8cdeedb80562b0ce6d948934

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index ab5d503..2d05606 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -685,15 +685,17 @@
 // Permissions
 aconfig_declarations {
     name: "android.permission.flags-aconfig",
-    package: "android.permission.flags",
     container: "system",
+    package: "android.permission.flags",
+    exportable: true,
     srcs: ["core/java/android/permission/flags.aconfig"],
 }
 
 java_aconfig_library {
-    name: "android.permission.flags-aconfig-java",
+    name: "android.permission.flags-aconfig-java-export",
     aconfig_declarations: "android.permission.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
+    mode: "exported",
     min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
@@ -708,9 +710,15 @@
     host_supported: true,
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
     min_sdk_version: "30",
+}
+
+java_aconfig_library {
+    name: "android.permission.flags-aconfig-java",
+    aconfig_declarations: "android.permission.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+    min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
-        "com.android.permission",
         "com.android.nfcservices",
     ],
 }