Prefer prebuilts by default.
SOONG_CONFIG_art_module_source_build is true by default instead, to
keep prefering sources.
Test: art/build/update-art-module-prebuilts.sh --local-dist=...
(Files in this CL writted by updated script.)
Bug: 172480615
Change-Id: Ifedb18e0988307b327dadf2f98b6c603f361c3f2
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 9d6583d..b785ec1 100755
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -9,8 +9,6 @@
],
}
-art_module_prefer_prebuilts = false
-
java_import {
name: "art-module-host-exports_art.module.api.annotations@current",
sdk_member_name: "art.module.api.annotations",
@@ -30,7 +28,7 @@
art_prebuilt_java_import {
name: "art.module.api.annotations",
// 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,
@@ -67,7 +65,7 @@
art_prebuilt_java_import {
name: "okhttp-norepackage",
// 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,
@@ -101,7 +99,7 @@
art_prebuilt_java_import {
name: "art-notices-for-framework-stubs-jar",
// 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,
@@ -144,7 +142,7 @@
art_prebuilt_cc_prebuilt_binary {
name: "hiddenapi",
// 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,
@@ -197,7 +195,7 @@
art_prebuilt_cc_prebuilt_binary {
name: "dex2oat",
// 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,
@@ -247,7 +245,7 @@
art_prebuilt_cc_prebuilt_binary {
name: "dex2oatd",
// 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,
diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp
index bd8c74b..bbfe6c6 100755
--- a/current/sdk/Android.bp
+++ b/current/sdk/Android.bp
@@ -14,8 +14,6 @@
],
}
-art_module_prefer_prebuilts = false
-
java_import {
name: "art-module-sdk_core-lambda-stubs@current",
sdk_member_name: "core-lambda-stubs",
@@ -27,7 +25,7 @@
art_prebuilt_java_import {
name: "core-lambda-stubs",
// 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,
@@ -49,7 +47,7 @@
art_prebuilt_java_import {
name: "core.current.stubs",
// 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,
@@ -71,7 +69,7 @@
art_prebuilt_java_import {
name: "legacy.core.platform.api.stubs",
// 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,
@@ -93,7 +91,7 @@
art_prebuilt_java_import {
name: "stable.core.platform.api.stubs",
// 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,
@@ -115,7 +113,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_art.module.public.api.stubs",
// 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,
@@ -137,7 +135,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_core-lambda-stubs-for-system-modules",
// 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,
@@ -159,7 +157,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_core-generated-annotation-stubs",
// 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,
@@ -181,7 +179,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_art.module.api.annotations.for.system.modules",
// 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,
@@ -203,7 +201,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_stub-annotations",
// 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,
@@ -225,7 +223,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_art.module.intra.core.api.stubs",
// 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,
@@ -247,7 +245,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_art-module-intra-core-api-stubs-system-modules-lib",
// 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,
@@ -269,7 +267,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_legacy.art.module.platform.api.stubs",
// 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,
@@ -291,7 +289,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_stable.art.module.platform.api.stubs",
// 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,
@@ -313,7 +311,7 @@
art_prebuilt_java_import {
name: "art-module-sdk_core-current-stubs-for-system-modules",
// 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,
@@ -349,7 +347,7 @@
art_prebuilt_java_sdk_library_import {
name: "art.module.public.api",
// 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,
@@ -397,7 +395,7 @@
art_prebuilt_java_system_modules_import {
name: "art-module-public-api-stubs-system-modules",
// 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,
@@ -440,7 +438,7 @@
art_prebuilt_java_system_modules_import {
name: "art-module-intra-core-api-stubs-system-modules",
// 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,
@@ -477,7 +475,7 @@
art_prebuilt_java_system_modules_import {
name: "legacy-art-module-platform-api-stubs-system-modules",
// 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,
@@ -511,7 +509,7 @@
art_prebuilt_java_system_modules_import {
name: "stable-art-module-platform-api-stubs-system-modules",
// 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,
@@ -538,7 +536,7 @@
art_prebuilt_java_system_modules_import {
name: "core-current-stubs-system-modules",
// 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,
@@ -562,7 +560,7 @@
art_prebuilt_java_system_modules_import {
name: "legacy-core-platform-api-stubs-system-modules",
// 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,
@@ -590,7 +588,7 @@
art_prebuilt_java_system_modules_import {
name: "stable-core-platform-api-stubs-system-modules",
// 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,
@@ -636,7 +634,7 @@
art_prebuilt_cc_prebuilt_library_headers {
name: "jni_headers",
// 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,
@@ -696,7 +694,7 @@
art_prebuilt_cc_prebuilt_library_headers {
name: "libartpalette-headers",
// 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,
@@ -755,7 +753,7 @@
art_prebuilt_cc_prebuilt_library_headers {
name: "libnativehelper_header_only",
// 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,
@@ -818,7 +816,7 @@
art_prebuilt_cc_prebuilt_library_headers {
name: "libopenjdkjvmti_headers",
// 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,
@@ -876,7 +874,7 @@
art_prebuilt_cc_prebuilt_library_headers {
name: "libnativeloader-headers",
// 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,
@@ -982,7 +980,7 @@
art_prebuilt_cc_prebuilt_library {
name: "libdexfile_support",
// 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,
@@ -1175,7 +1173,7 @@
art_prebuilt_cc_prebuilt_library {
name: "libsigchain",
// 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,
@@ -1340,7 +1338,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libandroidio",
// 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,
@@ -1440,7 +1438,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libdexfile_external",
// 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,
@@ -1541,7 +1539,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge",
// 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,
@@ -1645,7 +1643,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper",
// 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,
@@ -1749,7 +1747,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader",
// 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,
@@ -1843,7 +1841,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge_lazy",
// 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,
@@ -1931,7 +1929,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper_compat_libc++",
// 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,
@@ -2018,7 +2016,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader_lazy",
// 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,
@@ -2114,7 +2112,7 @@
art_prebuilt_cc_prebuilt_library_static {
name: "libdexfile_external_static",
// 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,
@@ -2205,7 +2203,7 @@
art_prebuilt_cc_prebuilt_library_static {
name: "libctstiagent",
// 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,
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 03a5431..0b2529c 100755
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -10,8 +10,6 @@
],
}
-art_module_prefer_prebuilts = false
-
java_import {
name: "art-module-test-exports_core-compat-test-rules@current",
sdk_member_name: "core-compat-test-rules",
@@ -28,7 +26,7 @@
art_prebuilt_java_import {
name: "core-compat-test-rules",
// 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,
@@ -65,7 +63,7 @@
art_prebuilt_java_import {
name: "core-test-rules",
// 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,
@@ -112,7 +110,7 @@
art_prebuilt_java_import {
name: "core-tests-support",
// 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,
@@ -154,7 +152,7 @@
art_prebuilt_java_import {
name: "okhttp-tests-nojarjar",
// 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,
@@ -185,7 +183,7 @@
art_prebuilt_java_import {
name: "art_cts_jvmti_test_library",
// 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,
@@ -216,7 +214,7 @@
art_prebuilt_java_import {
name: "expected_cts_outputs",
// 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,
@@ -255,7 +253,7 @@
art_prebuilt_java_import {
name: "core-libart",
// 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,
@@ -300,7 +298,7 @@
art_prebuilt_java_import {
name: "okhttp",
// 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,
@@ -338,7 +336,7 @@
art_prebuilt_java_import {
name: "libcore-expectations-knownfailures-jar",
// 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,
@@ -370,7 +368,7 @@
art_prebuilt_java_import {
name: "libcore-expectations-virtualdeviceknownfailures-jar",
// 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,
@@ -402,7 +400,7 @@
art_prebuilt_java_import {
name: "okhttp-nojarjar",
// 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,
@@ -435,7 +433,7 @@
art_prebuilt_java_test_import {
name: "apache-harmony-jdwp-tests",
// 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,
@@ -469,7 +467,7 @@
art_prebuilt_java_test_import {
name: "libcore-crypto-tests",
// 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,
@@ -503,7 +501,7 @@
art_prebuilt_java_test_import {
name: "core-ojtests-public",
// 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,
@@ -537,7 +535,7 @@
art_prebuilt_java_test_import {
name: "jsr166-tests",
// 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,
@@ -571,7 +569,7 @@
art_prebuilt_java_test_import {
name: "apache-harmony-tests",
// 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,
@@ -605,7 +603,7 @@
art_prebuilt_java_test_import {
name: "core-tests",
// 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,
@@ -657,7 +655,7 @@
art_prebuilt_cc_prebuilt_library_shared {
name: "libjavacoretests",
// 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,
