Snap for 8564071 from 5d4826c180190e08fddcdbef4f7fb2b00baa39ac to mainline-art-release
Change-Id: I7d94543422779f2a5ac75393be31c85b9467e611
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e741375..1ff137f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -21,15 +21,10 @@
TARGET_CPU_SMP := true
-# Flatten APEX packages to make them simpler to use in
-# ART testing/benchmarking environments.
-TARGET_FLATTEN_APEX := true
-
# Enable ART Module top level apex/sdk/module_export modules. When they are
# enabled the ART Module prebuilts (packages/modules/ArtPrebuilt and
# prebuilts/module_sdk/art) cannot be present with prefer:true in the build
# tree.
# TODO(b/174997203): Clean this up when there is a better way to switch between
# prebuilts and sources.
-$(call add_soong_config_namespace,art_module)
-$(call add_soong_config_var_value,art_module,source_build,true)
+$(call soong_config_set,art_module,source_build,true)
diff --git a/art_module/art_module.mk b/art_module/art_module.mk
index d8074ed..39bda5b 100644
--- a/art_module/art_module.mk
+++ b/art_module/art_module.mk
@@ -20,5 +20,4 @@
# tree.
# TODO(b/174997203): Clean up the art_module_* products when there is a better
# way to switch between prebuilts and sources.
-$(call add_soong_config_namespace,art_module)
-$(call add_soong_config_var_value,art_module,source_build,true)
+$(call soong_config_set,art_module,source_build,true)
