Merge ab/AP4A.241205.013 into aosp-main-future
Bug: 370570306
Merged-In: I6e88b091cbf59220589a59444cf56c0624e69d0e
Change-Id: I9d1a1850c4dcaebad42ac4b8d88fc5f0e8ce4d30
diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index d09c77a..21c1e02 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "12373408"
+ build_id: "12509279"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.art/host-exports/art-module-host-exports-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
index 64f7a35..6c7a016 100644
--- a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "12373408"
+ build_id: "12509279"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.art/sdk/art-module-sdk-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index 57a8865..99f1975 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "12373408"
+ build_id: "12509279"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.art/test-exports/art-module-test-exports-current.zip"
}
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index acdc0f0..e43017a 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -22,6 +22,11 @@
java_import {
name: "art.module.api.annotations",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//external/icu/android_icu4j",
@@ -70,6 +75,11 @@
cc_prebuilt_binary {
name: "dex2oat",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.art",
@@ -94,6 +104,11 @@
cc_prebuilt_binary {
name: "dex2oatd",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.art.debug"],
licenses: ["art-module-host-exports_art_license"],
@@ -114,6 +129,11 @@
cc_prebuilt_binary {
name: "dexdump",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//development/build",
@@ -143,6 +163,11 @@
cc_prebuilt_binary {
name: "hiddenapi",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -166,6 +191,11 @@
cc_prebuilt_binary {
name: "oatdump",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -193,6 +223,11 @@
cc_prebuilt_binary {
name: "profman",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -220,6 +255,11 @@
cc_prebuilt_binary {
name: "veridex",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index 893cd3d..99d1439 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12365824
\ No newline at end of file
+12507840
\ No newline at end of file
diff --git a/current/host-exports/x86_64/bin/dex2oat64 b/current/host-exports/x86_64/bin/dex2oat64
index 7cd5940..26363fc 100755
--- a/current/host-exports/x86_64/bin/dex2oat64
+++ b/current/host-exports/x86_64/bin/dex2oat64
Binary files differ
diff --git a/current/host-exports/x86_64/bin/dex2oatd64 b/current/host-exports/x86_64/bin/dex2oatd64
index c79a10a..e9ea6ee 100755
--- a/current/host-exports/x86_64/bin/dex2oatd64
+++ b/current/host-exports/x86_64/bin/dex2oatd64
Binary files differ
diff --git a/current/host-exports/x86_64/bin/oatdump b/current/host-exports/x86_64/bin/oatdump
index 125e012..a270b05 100755
--- a/current/host-exports/x86_64/bin/oatdump
+++ b/current/host-exports/x86_64/bin/oatdump
Binary files differ
diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp
index c40bc1d..bed83af 100644
--- a/current/sdk/Android.bp
+++ b/current/sdk/Android.bp
@@ -35,6 +35,11 @@
prebuilt_bootclasspath_fragment {
name: "art-bootclasspath-fragment",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/boot",
@@ -75,6 +80,11 @@
prebuilt_platform_compat_config {
name: "libcore-platform-compat-config",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -87,6 +97,11 @@
java_import {
name: "core-oj",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -107,6 +122,11 @@
java_import {
name: "core-libart",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -127,6 +147,11 @@
java_import {
name: "okhttp",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -149,6 +174,11 @@
java_import {
name: "bouncycastle",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -168,6 +198,11 @@
java_import {
name: "apache-xml",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -187,6 +222,11 @@
java_import {
name: "core-lambda-stubs",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -196,6 +236,11 @@
java_import {
name: "core-lambda-stubs-for-system-modules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -212,6 +257,11 @@
java_import {
name: "core-generated-annotation-stubs",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -228,6 +278,11 @@
java_import {
name: "art-module-sdk_art.module.api.annotations.for.system.modules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -236,6 +291,11 @@
java_import {
name: "art-module-sdk_art.module.intra.core.api.stubs",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -244,6 +304,11 @@
java_import {
name: "art-module-sdk_art-module-intra-core-api-stubs-system-modules-lib",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -252,6 +317,11 @@
java_sdk_library_import {
name: "art.module.public.api",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -294,6 +364,11 @@
java_sdk_library_import {
name: "service-art",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.art",
@@ -325,6 +400,11 @@
java_system_modules_import {
name: "art-module-public-api-stubs-system-modules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -343,6 +423,11 @@
java_system_modules_import {
name: "art-module-lib-api-stubs-system-modules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -356,6 +441,11 @@
java_system_modules_import {
name: "art-module-intra-core-api-stubs-system-modules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//build/soong/java/core-libraries",
@@ -455,6 +545,11 @@
cc_prebuilt_library_headers {
name: "jni_headers",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:anyapex",
@@ -487,6 +582,11 @@
cc_prebuilt_library_headers {
name: "libartpalette-headers",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -512,6 +612,11 @@
cc_prebuilt_library_headers {
name: "libnativehelper_header_only",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:anyapex",
@@ -540,6 +645,11 @@
cc_prebuilt_library_headers {
name: "libopenjdkjvmti_headers",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:platform",
@@ -569,6 +679,11 @@
cc_prebuilt_library_headers {
name: "odrefresh_headers",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_art_license"],
@@ -593,6 +708,11 @@
cc_prebuilt_library_headers {
name: "libnativeloader-headers",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/av/media/libstagefright",
@@ -616,6 +736,11 @@
cc_prebuilt_library_shared {
name: "libandroidio",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -668,6 +793,11 @@
cc_prebuilt_library_shared {
name: "libnativebridge",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -724,6 +854,11 @@
cc_prebuilt_library_shared {
name: "libnativehelper",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.art",
@@ -779,6 +914,11 @@
cc_prebuilt_library_shared {
name: "libnativeloader",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -835,6 +975,11 @@
cc_prebuilt_library_shared {
name: "libsigchain",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -887,6 +1032,11 @@
cc_prebuilt_library_shared {
name: "libdexfile",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//external/perfetto",
@@ -940,6 +1090,11 @@
prebuilt_systemserverclasspath_fragment {
name: "art-systemserverclasspath-fragment",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
diff --git a/current/sdk/linux_glibc/x86/lib/libnativeloader.so b/current/sdk/linux_glibc/x86/lib/libnativeloader.so
index ebed303..76d2cd8 100755
--- a/current/sdk/linux_glibc/x86/lib/libnativeloader.so
+++ b/current/sdk/linux_glibc/x86/lib/libnativeloader.so
Binary files differ
diff --git a/current/sdk/linux_glibc/x86_64/lib/libnativeloader.so b/current/sdk/linux_glibc/x86_64/lib/libnativeloader.so
index 43c5e2e..82d7e22 100755
--- a/current/sdk/linux_glibc/x86_64/lib/libnativeloader.so
+++ b/current/sdk/linux_glibc/x86_64/lib/libnativeloader.so
Binary files differ
diff --git a/current/sdk/snapshot-creation-build-number.txt b/current/sdk/snapshot-creation-build-number.txt
index 893cd3d..99d1439 100644
--- a/current/sdk/snapshot-creation-build-number.txt
+++ b/current/sdk/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12365824
\ No newline at end of file
+12507840
\ No newline at end of file
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 8121b7c..41010a2 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -32,6 +32,11 @@
java_import {
name: "core-compat-test-rules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//frameworks/base/tests/PlatformCompatGating/test-rules",
@@ -45,6 +50,11 @@
java_import {
name: "core-test-rules",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/core/runner-axt",
@@ -67,6 +77,11 @@
java_import {
name: "core-tests-support",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/apps/CtsVerifier",
@@ -92,6 +107,11 @@
java_import {
name: "okhttp-tests-nojarjar",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/okhttp",
@@ -105,6 +125,11 @@
java_import {
name: "art_cts_jvmti_test_library",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art:__subpackages__",
"//cts/hostsidetests/jvmti:__subpackages__",
@@ -118,6 +143,11 @@
java_import {
name: "expected_cts_outputs",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//art/test",
@@ -132,6 +162,11 @@
java_import {
name: "core-libart-for-host",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//external/robolectric",
@@ -148,6 +183,11 @@
java_import {
name: "okhttp-for-host",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//external/okhttp",
@@ -162,6 +202,11 @@
java_import {
name: "libcore-expectations-knownfailures-jar",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore:__subpackages__",
@@ -176,6 +221,11 @@
java_import {
name: "libcore-expectations-virtualdeviceknownfailures-jar",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore:__subpackages__",
@@ -190,6 +240,11 @@
java_import {
name: "okhttp-nojarjar",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/okhttp",
@@ -203,6 +258,11 @@
java_test_import {
name: "apache-harmony-jdwp-tests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/jdwp",
@@ -217,6 +277,11 @@
java_test_import {
name: "libcore-crypto-tests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//external/conscrypt/apex/tests",
@@ -231,6 +296,11 @@
java_test_import {
name: "core-ojtests-public",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/ojluni",
@@ -245,6 +315,11 @@
java_test_import {
name: "jsr166-tests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/jsr166",
@@ -259,6 +334,11 @@
java_test_import {
name: "apache-harmony-tests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
@@ -274,6 +354,11 @@
java_test_import {
name: "core-tests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
@@ -353,6 +438,11 @@
cc_prebuilt_library_shared {
name: "libjavacoretests",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
diff --git a/current/test-exports/java/core-tests.jar b/current/test-exports/java/core-tests.jar
index 6f6613d..4e8b43f 100644
--- a/current/test-exports/java/core-tests.jar
+++ b/current/test-exports/java/core-tests.jar
Binary files differ
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index 893cd3d..99d1439 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12365824
\ No newline at end of file
+12507840
\ No newline at end of file
