Merge "Add new flag for XR-specific manifest entries" into main (4a87d601) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+15 −0

Original line number	Diff line number	Diff line
		@@ -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",

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		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