summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Finder <jfinder@google.com> 2025-02-08 14:01:51 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-08 14:01:51 -0800
commita0d90e73560c08bea62f04ddfc19f6ff805fdb0c (patch)
treef887042a4caa0ff97c3a1a7ed537037f3749d9bd
parent818f0a868bb4ded3c8c909e78d8a2cf98d84d694 (diff)
parentb9df11cf19bd86f614d60fc9e534876b9b45c660 (diff)
Merge "Altering permission flag to be visible to other modules" into main
-rw-r--r--AconfigFlags.bp13
1 files changed, 10 insertions, 3 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 071cc6555be7..e5c059ecbfb7 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -84,7 +84,7 @@ aconfig_declarations_group {
"android.view.inputmethod.flags-aconfig-java",
"android.webkit.flags-aconfig-java",
"android.widget.flags-aconfig-java",
- "android.xr.flags-aconfig-java",
+ "android.xr.flags-aconfig-java-export",
"art_exported_aconfig_flags_lib",
"backstage_power_flags_lib",
"backup_flags_lib",
@@ -989,15 +989,22 @@ java_aconfig_library {
// XR
aconfig_declarations {
name: "android.xr.flags-aconfig",
- package: "android.xr",
container: "system",
+ exportable: true,
+ package: "android.xr",
srcs: ["core/java/android/content/pm/xr.aconfig"],
}
java_aconfig_library {
- name: "android.xr.flags-aconfig-java",
+ name: "android.xr.flags-aconfig-java-export",
aconfig_declarations: "android.xr.flags-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
+ min_sdk_version: "30",
+ mode: "exported",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.permission",
+ ],
}
// android.app