Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2855a829 authored by Joe Onorato's avatar Joe Onorato Committed by Automerger Merge Worker
Browse files

Merge "Rename device_config --> aconfig and definitions --> declarations" am:... 

Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb4575 am: 958b906e am: a83f50d1 am: 4a803530 am: 63a1fdcb

Original change: https://android-review.googlesource.com/c/platform/build/+/2633872



Change-Id: I2c7a992ddeb0556e0eaca610bf1eb4a63659515e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4aaa91f0 63a1fdcb

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

core/soong_config.mk

+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)

tools/aconfig/Android.bp

+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 {