From d6e9ea97a6e6244db7fc6b909f264c1ac1d225d0 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Tue, 15 Dec 2020 02:24:28 +0000 Subject: [PATCH] Temporarily set default to keep building with ART sources. Enables us to switch the default in .bp files, so ART prebuilt builds can be tested with `m SOONG_CONFIG_art_module_source_build=false`. Test: m Test: m SOONG_CONFIG_art_module_source_build=false Test: `m nothing` on some lunch targets that failed on internal Bug: 172480615 Change-Id: I78725f77819dc29b47d2438dfe724532e4d2df47 --- core/android_soong_config_vars.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index ee12c8c1e..883f92dc9 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -27,3 +27,10 @@ $(call add_soong_config_namespace,ANDROID) # Add variables to the namespace below: $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) + +# TODO(b/172480615): Remove when platform uses ART Module prebuilts by default. +ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES))) + $(call add_soong_config_namespace,art_module) + SOONG_CONFIG_art_module += source_build +endif +SOONG_CONFIG_art_module_source_build ?= true