diff options
| -rw-r--r-- | build_flags.bzl | 6 | ||||
| -rw-r--r-- | release_config_map.mk | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/build_flags.bzl b/build_flags.bzl index b436c8bd..324822c6 100644 --- a/build_flags.bzl +++ b/build_flags.bzl @@ -34,10 +34,8 @@ flags = [ # The default permission for all flags flag("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", ALL, "READ_WRITE"), - # The aconfig_value_set soong module(s) to use to set aconfig values. - # If multiple values are provided, then they will be used in the order they - # were added: the last value for a flag is the final value. - flag("RELEASE_ACONFIG_VALUE_SETS", ALL, None, appends = True), + # The aconfig_value_set soong module to use to set aconfig values. + flag("RELEASE_ACONFIG_VALUE_SETS", ALL, None), # Enables the use of the unfrozen versions of AIDL interfaces. # When this is `False` the libraries of the latest unfrozen version of a diff --git a/release_config_map.mk b/release_config_map.mk index 544add47..f92f76bb 100644 --- a/release_config_map.mk +++ b/release_config_map.mk @@ -12,11 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FLAG_DECLARATION_FILES gives the path(s) of flag declaration files that -# should be included in the build. -FLAG_DECLARATION_FILES := build/release/build_flags.bzl - -# Attach the flag value definitions to the various release configurations. $(call declare-release-config, next, build/release/build_config/next.bzl) $(call declare-release-config, trunk, build/release/build_config/trunk.bzl) $(call declare-release-config, trunk_food, build/release/build_config/trunk_food.bzl) |