Change default to build with ART Module prebuilts rather than sources.
Let SOONG_CONFIG_art_module_source_build default to true in make
instead, so it can be controlled from the command line.
Test: m
Test: m SOONG_CONFIG_art_module_source_build=false
Test: art/build/apex/runtests.sh on master-art
Test: art/tools/buildbot-build.sh on master-art
Bug: 172480615
Change-Id: I4f852d3245f9919b3e14e064c8e3067a63e306d3
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 6d146fc..f1f2e86 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -12,9 +12,6 @@
],
}
-// TODO(b/172480615): Change this to false to disable sources for platform.
-art_module_enable_sources = true
-
// Modules listed in LOCAL_REQUIRED_MODULES for module art-runtime in art/Android.mk.
// - Base requirements (binaries for which both 32- and 64-bit versions are built, if possible).
art_runtime_base_binaries_both = [
@@ -206,7 +203,7 @@
name: "com.android.art-defaults",
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
@@ -427,7 +424,7 @@
name: "art-check-apex-gen-defaults",
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
@@ -446,7 +443,7 @@
device_supported: false,
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index b7708db..405904c 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -20,9 +20,6 @@
],
}
-// TODO(b/172480615): Change this to false to disable sources for platform.
-art_module_enable_sources = true
-
// Additional visibility to add to the prebuilt modules that are part of
// the snapshots of the ART sdk/module_exports to ensure that they are
// visible to each other.
@@ -38,7 +35,7 @@
host_supported: true,
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
@@ -148,7 +145,7 @@
device_supported: true,
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
@@ -202,7 +199,7 @@
name: "art-module-test-exports",
// Enable if SOONG_CONFIG_art_module_source_build is true.
- enabled: art_module_enable_sources,
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,
diff --git a/build/update-art-module-prebuilts.py b/build/update-art-module-prebuilts.py
index 1e4ca35..3a41c77 100755
--- a/build/update-art-module-prebuilts.py
+++ b/build/update-art-module-prebuilts.py
@@ -123,7 +123,7 @@
module_content.extend([
(" // Do not prefer prebuilt if "
"SOONG_CONFIG_art_module_source_build is true."),
- " prefer: art_module_prefer_prebuilts,",
+ " prefer: true,",
" soong_config_variables: {",
" source_build: {",
" prefer: false,",
@@ -152,10 +152,6 @@
for art_module in sorted(art_module_types)] +
[" ],",
"}",
- "",
- # TODO(b/172480615): Change this to true to enable prebuilts for
- # platform.
- "art_module_prefer_prebuilts = false",
""])
bp_file.seek(0)
diff --git a/test/Android.bp b/test/Android.bp
index f19259d..f7e85e9 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1004,8 +1004,8 @@
art_module_cc_defaults {
name: "art_gtests_defaults",
- // TODO(b/172480615): Change this to false to disable sources for platform.
- enabled: true,
+ // Enable gtests only in source builds, where com.android.art.testing is available.
+ enabled: false,
soong_config_variables: {
source_build: {
enabled: true,