Merge "Rename device_config --> aconfig and definitions --> declarations" (9ccb4575) · Commits · e / os / android_build

core/release_config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		# defining the build flag values.
		#
		# (If you're thinking about aconfig flags, there is one build flag,
		# RELEASE_DEVICE_CONFIG_VALUE_SETS, that sets which device_config_value_set
		# RELEASE_ACONFIG_VALUE_SETS, that sets which aconfig_value_set
		# module to use to set the aconfig flag values.)
		#
		# The short release config names can appear multiple times, to allow

+1 −1

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ $(call add_json_str, ProductBrand, $(PRODUCT_BRAND))
		$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))

		$(call add_json_str, ReleaseVersion, $(_RELEASE_VERSION))
		$(call add_json_list, ReleaseDeviceConfigValueSets, $(RELEASE_DEVICE_CONFIG_VALUE_SETS))
		$(call add_json_list, ReleaseAconfigValueSets, $(RELEASE_ACONFIG_VALUE_SETS))

		$(call json_end)

+7 −7

Original line number	Diff line number	Diff line
		@@ -44,31 +44,31 @@ rust_test_host {

		// integration tests: java

		device_config_definitions {
		aconfig_declarations {
		name: "aconfig.test.flags",
		namespace: "com.android.aconfig.test",
		package: "com.android.aconfig.test",
		srcs: ["tests/test.aconfig"],
		}

		device_config_values {
		aconfig_values {
		name: "aconfig.test.flag.values",
		namespace: "com.android.aconfig.test",
		package: "com.android.aconfig.test",
		srcs: [
		"tests/first.values",
		"tests/second.values",
		],
		}

		device_config_value_set {
		aconfig_value_set {
		name: "aconfig.test.flag.value_set",
		values: [
		"aconfig.test.flag.values",
		],
		}

		java_device_config_definitions_library {
		java_aconfig_library {
		name: "aconfig_test_java",
		device_config_definitions: "aconfig.test.flags",
		aconfig_declarations: "aconfig.test.flags",
		}

		android_test {