tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Rename device_config --> aconfig and definitions --> declarations"

Browse source
This commit is contained in:
Joe Onorato 2023-06-22 13:30:53 +00:00 committed by Gerrit Code Review
commit 9ccb457588
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/release_config.mk
View file

@ -21,7 +21,7 @@
# defining the build flag values. # defining the build flag values.
# #
# (If you're thinking about aconfig flags, there is one build flag, # (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.) # module to use to set the aconfig flag values.)
# #
# The short release config names *can* appear multiple times, to allow # The short release config names *can* appear multiple times, to allow

2
core/soong_config.mk
View file

@ -317,7 +317,7 @@ $(call add_json_str, ProductBrand, $(PRODUCT_BRAND))
$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS)) $(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))
$(call add_json_str, ReleaseVersion, $(_RELEASE_VERSION)) $(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) $(call json_end)

14
tools/aconfig/Android.bp
View file

@ -44,31 +44,31 @@ rust_test_host {
// integration tests: java // integration tests: java
device_config_definitions { aconfig_declarations {
name: "aconfig.test.flags", name: "aconfig.test.flags",
namespace: "com.android.aconfig.test", package: "com.android.aconfig.test",
srcs: ["tests/test.aconfig"], srcs: ["tests/test.aconfig"],
} }
device_config_values { aconfig_values {
name: "aconfig.test.flag.values", name: "aconfig.test.flag.values",
namespace: "com.android.aconfig.test", package: "com.android.aconfig.test",
srcs: [ srcs: [
"tests/first.values", "tests/first.values",
"tests/second.values", "tests/second.values",
], ],
} }
device_config_value_set { aconfig_value_set {
name: "aconfig.test.flag.value_set", name: "aconfig.test.flag.value_set",
values: [ values: [
"aconfig.test.flag.values", "aconfig.test.flag.values",
], ],
} }
java_device_config_definitions_library { java_aconfig_library {
name: "aconfig_test_java", name: "aconfig_test_java",
device_config_definitions: "aconfig.test.flags", aconfig_declarations: "aconfig.test.flags",
} }
android_test { android_test {