diff options
| author | 2024-10-15 23:39:06 +0000 | |
|---|---|---|
| committer | 2024-10-15 23:39:06 +0000 | |
| commit | 4a87d601c5eb3b38efdf64b85607d1639ae0b99c (patch) | |
| tree | 2b85283dee42004f3ec1cd86460c87e4586a1b24 | |
| parent | 5c71da4b1abdbdd9a6cfcbf83c9279d28da4e3d0 (diff) | |
| parent | 7c6980cb38999434b355e689475aa4d2e3a637ff (diff) | |
Merge "Add new flag for XR-specific manifest entries" into main
| -rw-r--r-- | AconfigFlags.bp | 15 | ||||
| -rw-r--r-- | core/java/android/content/pm/xr.aconfig | 9 |
2 files changed, 24 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 9c766e980e60..0080a8d63bfc 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -81,6 +81,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", "art_exported_aconfig_flags_lib", "backstage_power_flags_lib", "backup_flags_lib", @@ -899,6 +900,20 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// XR +aconfig_declarations { + name: "android.xr.flags-aconfig", + package: "android.xr", + container: "system", + srcs: ["core/java/android/content/pm/xr.aconfig"], +} + +java_aconfig_library { + name: "android.xr.flags-aconfig-java", + aconfig_declarations: "android.xr.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // android.app aconfig_declarations { name: "android.app.flags-aconfig", diff --git a/core/java/android/content/pm/xr.aconfig b/core/java/android/content/pm/xr.aconfig new file mode 100644 index 000000000000..61835c162c49 --- /dev/null +++ b/core/java/android/content/pm/xr.aconfig @@ -0,0 +1,9 @@ +package: "android.xr" +container: "system" + +flag { + namespace: "xr" + name: "xr_manifest_entries" + description: "Adds manifest entries used by Android XR" + bug: "364416355" +}
\ No newline at end of file |