Merge "aconfig: add a flag for launching aconfigd from mainline" into main (1ee096e0) · Commits · e / os / android_build

tools/aconfig/aconfig_flags/flags.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,10 @@ flag {
		bug: "312235596"
		description: "When enabled, aconfig flags are read from the new aconfig storage only."
		}

		flag {
		name: "enable_aconfigd_from_mainline"
		namespace: "core_experiments_team_internal"
		bug: "369808805"
		description: "When enabled, launch aconfigd from config infra module."
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,11 @@ pub mod auto_generated {
		pub fn enable_only_new_storage() -> bool {
		aconfig_flags_rust::enable_only_new_storage()
		}

		/// Returns the value for the enable_aconfigd_from_mainline flag.
		pub fn enable_aconfigd_from_mainline() -> bool {
		aconfig_flags_rust::enable_only_new_storage()
		}
		}

		/// Module used when building with cargo
		@@ -44,4 +49,10 @@ pub mod auto_generated {
		// Used only to enable typechecking and testing with cargo
		true
		}

		/// Returns a placeholder value for the enable_aconfigd_from_mainline flag.
		pub fn enable_aconfigd_from_mainline() -> bool {
		// Used only to enable typechecking and testing with cargo
		true
		}
		}