diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index dda4b09..1ff137f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -27,5 +27,4 @@
 # 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)