Merge cherrypicks of [16736103, 16736104] into sc-v2-release.
Change-Id: I092ca9f4a4c0c8c7968db29034a8476c2f82a62e
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 8a37e6d..8d68caf 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,8 +1,8 @@
drops {
android_build_drop {
- build_id: "7756215"
+ build_id: "7924123"
target: "mainline_modules-user"
- source_file: "mainline-sdks/art-module-host-exports-current.zip"
+ source_file: "mainline-sdks/current/com.google.android.art/host-exports/art-module-host-exports-current.zip"
}
dest_file: "current/host-exports/current.zip"
version: ""
diff --git a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
index e76ba34..9c7da65 100644
--- a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
@@ -1,8 +1,8 @@
drops {
android_build_drop {
- build_id: "7756215"
+ build_id: "7924123"
target: "mainline_modules-user"
- source_file: "mainline-sdks/art-module-sdk-current.zip"
+ source_file: "mainline-sdks/current/com.google.android.art/sdk/art-module-sdk-current.zip"
}
dest_file: "current/sdk/current.zip"
version: ""
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 56385f7..59cd70c 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,8 +1,8 @@
drops {
android_build_drop {
- build_id: "7756215"
+ build_id: "7924123"
target: "mainline_modules-user"
- source_file: "mainline-sdks/art-module-test-exports-current.zip"
+ source_file: "mainline-sdks/current/com.google.android.art/test-exports/art-module-test-exports-current.zip"
}
dest_file: "current/test-exports/current.zip"
version: ""
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 9a9a010..a02eb1f 100755
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -1,6 +1,6 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/unbundled_google/modules/ArtGooglePrebuilt/update-art-module-prebuilts.py.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
soong_config_module_type_import {
from: "prebuilts/module_sdk/art/SoongConfig.bp",
module_types: [
@@ -784,4 +784,4 @@
enabled: true,
},
},
-}
\ No newline at end of file
+}
diff --git a/current/host-exports/Android.bp.auto b/current/host-exports/Android.bp.auto
old mode 100755
new mode 100644
index 484bd33..a02eb1f
--- a/current/host-exports/Android.bp.auto
+++ b/current/host-exports/Android.bp.auto
@@ -1,5 +1,15 @@
// This is auto-generated. DO NOT EDIT.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+ from: "prebuilts/module_sdk/art/SoongConfig.bp",
+ module_types: [
+ "art_prebuilt_cc_prebuilt_binary",
+ "art_prebuilt_cc_prebuilt_library",
+ "art_prebuilt_java_import",
+ ],
+}
+
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -23,9 +33,15 @@
jars: ["java/art.module.api.annotations.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art.module.api.annotations",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/icu/android_icu4j",
@@ -56,9 +72,15 @@
jars: ["java/okhttp-norepackage.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "okhttp-norepackage",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/grpc-grpc-java/okhttp",
@@ -178,9 +200,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "dex2oat",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.art",
@@ -224,9 +252,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "dex2oatd",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["com.android.art.debug"],
licenses: ["art-module-host-exports_art_license"],
@@ -273,9 +307,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "dexdump",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -325,9 +365,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "hiddenapi",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -377,9 +423,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "oatdump",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -432,9 +484,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "profman",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -484,9 +542,15 @@
},
}
-cc_prebuilt_binary {
+art_prebuilt_cc_prebuilt_binary {
name: "veridex",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -547,9 +611,15 @@
},
}
-cc_prebuilt_library {
+art_prebuilt_cc_prebuilt_library {
name: "libartpalette",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts/module_sdk/art/current/host-exports",
@@ -631,9 +701,15 @@
},
}
-cc_prebuilt_library {
+art_prebuilt_cc_prebuilt_library {
name: "libartbase",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//packages/modules/NetworkStack/tests:__subpackages__",
diff --git a/current/host-exports/x86_64/bin/dex2oat64 b/current/host-exports/x86_64/bin/dex2oat64
index de1faf5..6b6d4c8 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 33d994e..01fd329 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 d079858..9785825 100755
--- a/current/host-exports/x86_64/bin/oatdump
+++ b/current/host-exports/x86_64/bin/oatdump
Binary files differ
diff --git a/current/host-exports/x86_64/bin/profman b/current/host-exports/x86_64/bin/profman
index 6562f54..50ef374 100755
--- a/current/host-exports/x86_64/bin/profman
+++ b/current/host-exports/x86_64/bin/profman
Binary files differ
diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp
index 46c0a6d..15476bc 100755
--- a/current/sdk/Android.bp
+++ b/current/sdk/Android.bp
@@ -1,6 +1,6 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/unbundled_google/modules/ArtGooglePrebuilt/update-art-module-prebuilts.py.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
soong_config_module_type_import {
from: "prebuilts/module_sdk/art/SoongConfig.bp",
module_types: [
@@ -47,7 +47,7 @@
stub_libs: ["art-module-sdk_art.module.public.api@current"],
},
core_platform_api: {
- stub_libs: ["art-module-sdk_legacy.art.module.platform.api@current"],
+ stub_libs: ["art-module-sdk_art.module.public.api.stubs.module_lib@current"],
},
hidden_api: {
max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
@@ -93,7 +93,7 @@
stub_libs: ["art.module.public.api"],
},
core_platform_api: {
- stub_libs: ["legacy.art.module.platform.api"],
+ stub_libs: ["art.module.public.api.stubs.module_lib"],
},
hidden_api: {
max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
@@ -610,30 +610,6 @@
}
java_import {
- name: "art-module-sdk_stable.art.module.platform.api.stubs@current",
- sdk_member_name: "stable.art.module.platform.api.stubs",
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/stable.art.module.platform.api.stubs.jar"],
-}
-
-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: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
- },
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license"],
- jars: ["java/stable.art.module.platform.api.stubs.jar"],
-}
-
-java_import {
name: "art-module-sdk_core-current-stubs-for-system-modules@current",
sdk_member_name: "core-current-stubs-for-system-modules",
visibility: ["//visibility:private"],
@@ -657,6 +633,30 @@
jars: ["java/core-current-stubs-for-system-modules.jar"],
}
+java_import {
+ name: "art-module-sdk_core.module_lib.stubs@current",
+ sdk_member_name: "core.module_lib.stubs",
+ visibility: ["//visibility:private"],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["art-module-sdk_libcore_license@current"],
+ jars: ["java/core.module_lib.stubs.jar"],
+}
+
+art_prebuilt_java_import {
+ name: "art-module-sdk_core.module_lib.stubs",
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
+ visibility: ["//visibility:private"],
+ apex_available: ["//apex_available:platform"],
+ licenses: ["art-module-sdk_libcore_license"],
+ jars: ["java/core.module_lib.stubs.jar"],
+}
+
java_sdk_library_import {
name: "art-module-sdk_art.module.public.api@current",
sdk_member_name: "art.module.public.api",
@@ -741,52 +741,6 @@
},
}
-java_sdk_library_import {
- name: "art-module-sdk_legacy.art.module.platform.api@current",
- sdk_member_name: "legacy.art.module.platform.api",
- visibility: [
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- shared_library: false,
- compile_dex: true,
- public: {
- jars: ["sdk_library/public/legacy.art.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/legacy.art.module.platform.api.srcjar"],
- current_api: "sdk_library/public/legacy.art.module.platform.api.txt",
- removed_api: "sdk_library/public/legacy.art.module.platform.api-removed.txt",
- sdk_version: "none",
- },
-}
-
-art_prebuilt_java_sdk_library_import {
- name: "legacy.art.module.platform.api",
- // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
- },
- visibility: [
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license"],
- shared_library: false,
- compile_dex: true,
- public: {
- jars: ["sdk_library/public/legacy.art.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/legacy.art.module.platform.api.srcjar"],
- current_api: "sdk_library/public/legacy.art.module.platform.api.txt",
- removed_api: "sdk_library/public/legacy.art.module.platform.api-removed.txt",
- sdk_version: "none",
- },
-}
-
java_system_modules_import {
name: "art-module-sdk_art-module-public-api-stubs-system-modules@current",
sdk_member_name: "art-module-public-api-stubs-system-modules",
@@ -836,6 +790,40 @@
}
java_system_modules_import {
+ name: "art-module-sdk_art-module-lib-api-stubs-system-modules@current",
+ sdk_member_name: "art-module-lib-api-stubs-system-modules",
+ visibility: [
+ "//art/build/sdk",
+ "//external/conscrypt",
+ "//external/icu/android_icu4j",
+ "//libcore",
+ "//prebuilts:__subpackages__",
+ ],
+ licenses: ["art-module-sdk_libcore_license@current"],
+ libs: ["art-module-sdk_art.module.public.api.stubs.module_lib@current"],
+}
+
+art_prebuilt_java_system_modules_import {
+ name: "art-module-lib-api-stubs-system-modules",
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
+ visibility: [
+ "//art/build/sdk",
+ "//external/conscrypt",
+ "//external/icu/android_icu4j",
+ "//libcore",
+ "//prebuilts:__subpackages__",
+ ],
+ licenses: ["art-module-sdk_libcore_license"],
+ libs: ["art.module.public.api.stubs.module_lib"],
+}
+
+java_system_modules_import {
name: "art-module-sdk_art-module-intra-core-api-stubs-system-modules@current",
sdk_member_name: "art-module-intra-core-api-stubs-system-modules",
visibility: [
@@ -878,78 +866,6 @@
}
java_system_modules_import {
- name: "art-module-sdk_legacy-art-module-platform-api-stubs-system-modules@current",
- sdk_member_name: "legacy-art-module-platform-api-stubs-system-modules",
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- libs: ["art-module-sdk_legacy.art.module.platform.api.stubs@current"],
-}
-
-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: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
- },
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license"],
- libs: ["legacy.art.module.platform.api.stubs"],
-}
-
-java_system_modules_import {
- name: "art-module-sdk_stable-art-module-platform-api-stubs-system-modules@current",
- sdk_member_name: "stable-art-module-platform-api-stubs-system-modules",
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- libs: ["art-module-sdk_stable.art.module.platform.api.stubs@current"],
-}
-
-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: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
- },
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license"],
- libs: ["art-module-sdk_stable.art.module.platform.api.stubs"],
-}
-
-java_system_modules_import {
name: "art-module-sdk_core-current-stubs-system-modules@current",
sdk_member_name: "core-current-stubs-system-modules",
visibility: ["//visibility:public"],
@@ -972,6 +888,36 @@
}
java_system_modules_import {
+ name: "art-module-sdk_core-module-lib-stubs-system-modules@current",
+ sdk_member_name: "core-module-lib-stubs-system-modules",
+ visibility: ["//visibility:public"],
+ licenses: ["art-module-sdk_libcore_license@current"],
+ libs: [
+ "art-module-sdk_core.module_lib.stubs@current",
+ "art-module-sdk_core-lambda-stubs-for-system-modules@current",
+ "art-module-sdk_core-generated-annotation-stubs@current",
+ ],
+}
+
+art_prebuilt_java_system_modules_import {
+ name: "core-module-lib-stubs-system-modules",
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
+ visibility: ["//visibility:public"],
+ licenses: ["art-module-sdk_libcore_license"],
+ libs: [
+ "art-module-sdk_core.module_lib.stubs",
+ "art-module-sdk_core-lambda-stubs-for-system-modules",
+ "art-module-sdk_core-generated-annotation-stubs",
+ ],
+}
+
+java_system_modules_import {
name: "art-module-sdk_legacy-core-platform-api-stubs-system-modules@current",
sdk_member_name: "legacy-core-platform-api-stubs-system-modules",
visibility: ["//visibility:public"],
@@ -2285,6 +2231,7 @@
"//external/perfetto:__subpackages__",
"//frameworks/base/packages/Connectivity/tests/integration",
"//frameworks/base/packages/Tethering:__subpackages__",
+ "//frameworks/libs/net/common/native/bpfmapjni",
"//libcore:__subpackages__",
"//libnativehelper:__subpackages__",
"//packages/modules/Connectivity/Tethering:__subpackages__",
@@ -2341,6 +2288,7 @@
"//external/perfetto:__subpackages__",
"//frameworks/base/packages/Connectivity/tests/integration",
"//frameworks/base/packages/Tethering:__subpackages__",
+ "//frameworks/libs/net/common/native/bpfmapjni",
"//libcore:__subpackages__",
"//libnativehelper:__subpackages__",
"//packages/modules/Connectivity/Tethering:__subpackages__",
@@ -2803,16 +2751,13 @@
"art-module-sdk_legacy.core.platform.api.stubs@current",
"art-module-sdk_stable.core.platform.api.stubs@current",
],
- java_sdk_libs: [
- "art-module-sdk_art.module.public.api@current",
- "art-module-sdk_legacy.art.module.platform.api@current",
- ],
+ java_sdk_libs: ["art-module-sdk_art.module.public.api@current"],
java_system_modules: [
"art-module-sdk_art-module-public-api-stubs-system-modules@current",
+ "art-module-sdk_art-module-lib-api-stubs-system-modules@current",
"art-module-sdk_art-module-intra-core-api-stubs-system-modules@current",
- "art-module-sdk_legacy-art-module-platform-api-stubs-system-modules@current",
- "art-module-sdk_stable-art-module-platform-api-stubs-system-modules@current",
"art-module-sdk_core-current-stubs-system-modules@current",
+ "art-module-sdk_core-module-lib-stubs-system-modules@current",
"art-module-sdk_legacy-core-platform-api-stubs-system-modules@current",
"art-module-sdk_stable-core-platform-api-stubs-system-modules@current",
],
diff --git a/current/sdk/Android.bp.auto b/current/sdk/Android.bp.auto
old mode 100755
new mode 100644
index a92132b..abe0db2
--- a/current/sdk/Android.bp.auto
+++ b/current/sdk/Android.bp.auto
@@ -1,5 +1,20 @@
// This is auto-generated. DO NOT EDIT.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+ from: "prebuilts/module_sdk/art/SoongConfig.bp",
+ module_types: [
+ "art_prebuilt_cc_prebuilt_library_headers",
+ "art_prebuilt_cc_prebuilt_library_shared",
+ "art_prebuilt_cc_prebuilt_library_static",
+ "art_prebuilt_java_import",
+ "art_prebuilt_java_sdk_library_import",
+ "art_prebuilt_java_system_modules_import",
+ "art_prebuilt_prebuilt_bootclasspath_fragment",
+ "art_prebuilt_prebuilt_platform_compat_config",
+ ],
+}
+
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -46,9 +61,15 @@
},
}
-prebuilt_bootclasspath_fragment {
+art_prebuilt_prebuilt_bootclasspath_fragment {
name: "art-bootclasspath-fragment",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/boot",
@@ -99,9 +120,15 @@
metadata: "compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml",
}
-prebuilt_platform_compat_config {
+art_prebuilt_prebuilt_platform_compat_config {
name: "libcore-platform-compat-config",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -132,9 +159,15 @@
jars: ["java/core-oj.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-oj",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -172,9 +205,15 @@
jars: ["java/core-libart.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-libart",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -213,9 +252,15 @@
jars: ["java/okhttp.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "okhttp",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -254,9 +299,15 @@
jars: ["java/bouncycastle.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "bouncycastle",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -293,9 +344,15 @@
jars: ["java/apache-xml.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "apache-xml",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -321,9 +378,15 @@
jars: ["java/core-lambda-stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-lambda-stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -339,9 +402,15 @@
jars: ["java/core.current.stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core.current.stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -357,9 +426,15 @@
jars: ["java/legacy.core.platform.api.stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "legacy.core.platform.api.stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -375,9 +450,15 @@
jars: ["java/stable.core.platform.api.stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "stable.core.platform.api.stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -393,9 +474,15 @@
jars: ["java/core-lambda-stubs-for-system-modules.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_core-lambda-stubs-for-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -411,9 +498,15 @@
jars: ["java/core-generated-annotation-stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_core-generated-annotation-stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -429,9 +522,15 @@
jars: ["java/art.module.api.annotations.for.system.modules.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_art.module.api.annotations.for.system.modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -447,9 +546,15 @@
jars: ["java/stub-annotations.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_stub-annotations",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_Android-Apache-2.0"],
@@ -465,9 +570,15 @@
jars: ["java/art.module.intra.core.api.stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_art.module.intra.core.api.stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -483,9 +594,15 @@
jars: ["java/art-module-intra-core-api-stubs-system-modules-lib.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_art-module-intra-core-api-stubs-system-modules-lib",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -501,9 +618,15 @@
jars: ["java/core-current-stubs-for-system-modules.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_core-current-stubs-for-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -519,9 +642,15 @@
jars: ["java/core.module_lib.stubs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art-module-sdk_core.module_lib.stubs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libcore_license"],
@@ -549,6 +678,7 @@
stub_srcs: ["sdk_library/public/art.module.public.api.srcjar"],
current_api: "sdk_library/public/art.module.public.api.txt",
removed_api: "sdk_library/public/art.module.public.api-removed.txt",
+ annotations: "sdk_library/public/art.module.public.api_annotations.zip",
sdk_version: "none",
},
system: {
@@ -556,6 +686,7 @@
stub_srcs: ["sdk_library/system/art.module.public.api.srcjar"],
current_api: "sdk_library/system/art.module.public.api.txt",
removed_api: "sdk_library/system/art.module.public.api-removed.txt",
+ annotations: "sdk_library/system/art.module.public.api_annotations.zip",
sdk_version: "none",
},
module_lib: {
@@ -563,13 +694,20 @@
stub_srcs: ["sdk_library/module-lib/art.module.public.api.srcjar"],
current_api: "sdk_library/module-lib/art.module.public.api.txt",
removed_api: "sdk_library/module-lib/art.module.public.api-removed.txt",
+ annotations: "sdk_library/module-lib/art.module.public.api_annotations.zip",
sdk_version: "none",
},
}
-java_sdk_library_import {
+art_prebuilt_java_sdk_library_import {
name: "art.module.public.api",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//frameworks/base",
@@ -588,6 +726,7 @@
stub_srcs: ["sdk_library/public/art.module.public.api.srcjar"],
current_api: "sdk_library/public/art.module.public.api.txt",
removed_api: "sdk_library/public/art.module.public.api-removed.txt",
+ annotations: "sdk_library/public/art.module.public.api_annotations.zip",
sdk_version: "none",
},
system: {
@@ -595,6 +734,7 @@
stub_srcs: ["sdk_library/system/art.module.public.api.srcjar"],
current_api: "sdk_library/system/art.module.public.api.txt",
removed_api: "sdk_library/system/art.module.public.api-removed.txt",
+ annotations: "sdk_library/system/art.module.public.api_annotations.zip",
sdk_version: "none",
},
module_lib: {
@@ -602,6 +742,7 @@
stub_srcs: ["sdk_library/module-lib/art.module.public.api.srcjar"],
current_api: "sdk_library/module-lib/art.module.public.api.txt",
removed_api: "sdk_library/module-lib/art.module.public.api-removed.txt",
+ annotations: "sdk_library/module-lib/art.module.public.api_annotations.zip",
sdk_version: "none",
},
}
@@ -627,9 +768,15 @@
],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "art-module-public-api-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/conscrypt",
@@ -662,9 +809,15 @@
libs: ["art-module-sdk_art.module.public.api.stubs.module_lib@current"],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "art-module-lib-api-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/conscrypt",
@@ -694,9 +847,15 @@
],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "art-module-intra-core-api-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/bouncycastle",
@@ -720,9 +879,15 @@
libs: ["art-module-sdk_core-current-stubs-for-system-modules@current"],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "core-current-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
licenses: ["art-module-sdk_libcore_license"],
libs: ["art-module-sdk_core-current-stubs-for-system-modules"],
@@ -740,9 +905,15 @@
],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "core-module-lib-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
licenses: ["art-module-sdk_libcore_license"],
libs: [
@@ -764,9 +935,15 @@
],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "legacy-core-platform-api-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
licenses: ["art-module-sdk_libcore_license"],
libs: [
@@ -788,9 +965,15 @@
],
}
-java_system_modules_import {
+art_prebuilt_java_system_modules_import {
name: "stable-core-platform-api-stubs-system-modules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
licenses: ["art-module-sdk_libcore_license"],
libs: [
@@ -1008,9 +1191,15 @@
},
}
-cc_prebuilt_library_headers {
+art_prebuilt_cc_prebuilt_library_headers {
name: "jni_headers",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:anyapex",
@@ -1064,9 +1253,15 @@
},
}
-cc_prebuilt_library_headers {
+art_prebuilt_cc_prebuilt_library_headers {
name: "libartpalette-headers",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//prebuilts:__subpackages__",
@@ -1119,9 +1314,15 @@
},
}
-cc_prebuilt_library_headers {
+art_prebuilt_cc_prebuilt_library_headers {
name: "libnativehelper_header_only",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:anyapex",
@@ -1178,9 +1379,15 @@
},
}
-cc_prebuilt_library_headers {
+art_prebuilt_cc_prebuilt_library_headers {
name: "libopenjdkjvmti_headers",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:platform",
@@ -1232,9 +1439,15 @@
],
}
-cc_prebuilt_library_headers {
+art_prebuilt_cc_prebuilt_library_headers {
name: "libnativeloader-headers",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/av/media/libstagefright",
@@ -1307,9 +1520,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libandroidio",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/apex",
"//art/build/sdk",
@@ -1362,7 +1581,11 @@
sdk_member_name: "libdexfile",
visibility: [
"//art:__subpackages__",
+ "//external/perfetto",
"//prebuilts:__subpackages__",
+ "//system/core/debuggerd",
+ "//system/extras/simpleperf",
+ "//system/unwinding/libunwindstack",
],
apex_available: [
"com.android.art",
@@ -1413,12 +1636,22 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libdexfile",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
+ "//external/perfetto",
"//prebuilts:__subpackages__",
+ "//system/core/debuggerd",
+ "//system/extras/simpleperf",
+ "//system/unwinding/libunwindstack",
],
apex_available: [
"com.android.art",
@@ -1522,9 +1755,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -1628,9 +1867,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"com.android.art",
@@ -1734,9 +1979,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -1837,9 +2088,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libsigchain",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/cmds/app_process",
@@ -1926,9 +2183,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge_lazy",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/libnativebridge/tests",
"//art:__subpackages__",
@@ -1974,6 +2237,7 @@
"//external/perfetto:__subpackages__",
"//frameworks/base/packages/Connectivity/tests/integration",
"//frameworks/base/packages/Tethering:__subpackages__",
+ "//frameworks/libs/net/common/native/bpfmapjni",
"//libcore:__subpackages__",
"//libnativehelper:__subpackages__",
"//packages/modules/Connectivity/Tethering:__subpackages__",
@@ -2015,15 +2279,22 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper_compat_libc++",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//cts:__subpackages__",
"//external/perfetto:__subpackages__",
"//frameworks/base/packages/Connectivity/tests/integration",
"//frameworks/base/packages/Tethering:__subpackages__",
+ "//frameworks/libs/net/common/native/bpfmapjni",
"//libcore:__subpackages__",
"//libnativehelper:__subpackages__",
"//packages/modules/Connectivity/Tethering:__subpackages__",
@@ -2103,9 +2374,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader_lazy",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//frameworks/base/core/jni",
@@ -2192,9 +2469,15 @@
},
}
-cc_prebuilt_library_static {
+art_prebuilt_cc_prebuilt_library_static {
name: "libdexfile_support",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: [
"//apex_available:platform",
@@ -2296,9 +2579,15 @@
},
}
-cc_prebuilt_library_static {
+art_prebuilt_cc_prebuilt_library_static {
name: "libdexfile_static",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//cts/tests/tests/simpleperf",
@@ -2393,9 +2682,15 @@
},
}
-cc_prebuilt_library_static {
+art_prebuilt_cc_prebuilt_library_static {
name: "libnativehelper_lazy",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
licenses: ["art-module-sdk_libnativehelper_license"],
diff --git a/current/sdk/android/arm/lib/libdexfile_static.a b/current/sdk/android/arm/lib/libdexfile_static.a
index 3d81b58..715b8ce 100644
--- a/current/sdk/android/arm/lib/libdexfile_static.a
+++ b/current/sdk/android/arm/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/arm64/lib/libdexfile_static.a b/current/sdk/android/arm64/lib/libdexfile_static.a
index 6144ed7..a28aed6 100644
--- a/current/sdk/android/arm64/lib/libdexfile_static.a
+++ b/current/sdk/android/arm64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/x86/lib/libdexfile_static.a b/current/sdk/android/x86/lib/libdexfile_static.a
index 19dbc39..d2790bf 100644
--- a/current/sdk/android/x86/lib/libdexfile_static.a
+++ b/current/sdk/android/x86/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/x86/lib/libdexfile_support.a b/current/sdk/android/x86/lib/libdexfile_support.a
index 24542c2..13e8933 100644
--- a/current/sdk/android/x86/lib/libdexfile_support.a
+++ b/current/sdk/android/x86/lib/libdexfile_support.a
Binary files differ
diff --git a/current/sdk/sdk_library/module-lib/art.module.public.api_annotations.zip b/current/sdk/sdk_library/module-lib/art.module.public.api_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk/sdk_library/module-lib/art.module.public.api_annotations.zip
Binary files differ
diff --git a/current/sdk/sdk_library/public/art.module.public.api_annotations.zip b/current/sdk/sdk_library/public/art.module.public.api_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk/sdk_library/public/art.module.public.api_annotations.zip
Binary files differ
diff --git a/current/sdk/sdk_library/system/art.module.public.api_annotations.zip b/current/sdk/sdk_library/system/art.module.public.api_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk/sdk_library/system/art.module.public.api_annotations.zip
Binary files differ
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 1e1faa7..2ade997 100755
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -1,6 +1,6 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/unbundled_google/modules/ArtGooglePrebuilt/update-art-module-prebuilts.py.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
soong_config_module_type_import {
from: "prebuilts/module_sdk/art/SoongConfig.bp",
module_types: [
@@ -851,4 +851,4 @@
"art-module-test-exports_core-tests@current",
],
native_shared_libs: ["art-module-test-exports_libjavacoretests@current"],
-}
\ No newline at end of file
+}
diff --git a/current/test-exports/Android.bp.auto b/current/test-exports/Android.bp.auto
old mode 100755
new mode 100644
index 1f1a0a2..2ade997
--- a/current/test-exports/Android.bp.auto
+++ b/current/test-exports/Android.bp.auto
@@ -1,5 +1,15 @@
// This is auto-generated. DO NOT EDIT.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+ from: "prebuilts/module_sdk/art/SoongConfig.bp",
+ module_types: [
+ "art_prebuilt_cc_prebuilt_library_shared",
+ "art_prebuilt_java_import",
+ "art_prebuilt_java_test_import",
+ ],
+}
+
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -20,9 +30,15 @@
jars: ["java/core-compat-test-rules.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-compat-test-rules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//frameworks/base/tests/PlatformCompatGating/test-rules",
@@ -54,9 +70,15 @@
jars: ["java/core-test-rules.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-test-rules",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/tests/util",
@@ -97,9 +119,15 @@
jars: ["java/core-tests-support.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-tests-support",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/apps/CtsVerifier",
@@ -134,9 +162,15 @@
jars: ["java/okhttp-tests-nojarjar.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "okhttp-tests-nojarjar",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/okhttp",
@@ -161,9 +195,15 @@
jars: ["java/art_cts_jvmti_test_library.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "art_cts_jvmti_test_library",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art:__subpackages__",
"//cts/hostsidetests/jvmti:__subpackages__",
@@ -188,9 +228,15 @@
jars: ["java/expected_cts_outputs.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "expected_cts_outputs",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//art/test",
@@ -217,9 +263,15 @@
jars: ["java/core-libart-for-host.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "core-libart-for-host",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/robolectric-shadows",
@@ -246,9 +298,15 @@
jars: ["java/okhttp-for-host.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "okhttp-for-host",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/okhttp",
@@ -274,9 +332,15 @@
jars: ["java/libcore-expectations-knownfailures-jar.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "libcore-expectations-knownfailures-jar",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore:__subpackages__",
@@ -302,9 +366,15 @@
jars: ["java/libcore-expectations-virtualdeviceknownfailures-jar.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "libcore-expectations-virtualdeviceknownfailures-jar",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore:__subpackages__",
@@ -330,9 +400,15 @@
jars: ["java/okhttp-nojarjar.jar"],
}
-java_import {
+art_prebuilt_java_import {
name: "okhttp-nojarjar",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/okhttp",
@@ -359,9 +435,15 @@
test_config: "java/apache-harmony-jdwp-tests-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "apache-harmony-jdwp-tests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/jdwp",
@@ -389,9 +471,15 @@
test_config: "java/libcore-crypto-tests-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "libcore-crypto-tests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//external/conscrypt/apex/tests",
@@ -419,9 +507,15 @@
test_config: "java/core-ojtests-public-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "core-ojtests-public",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/ojluni",
@@ -449,9 +543,15 @@
test_config: "java/jsr166-tests-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "jsr166-tests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/jsr166",
@@ -479,9 +579,15 @@
test_config: "java/apache-harmony-tests-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "apache-harmony-tests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
@@ -509,9 +615,15 @@
test_config: "java/core-tests-AndroidTest.xml",
}
-java_test_import {
+art_prebuilt_java_test_import {
name: "core-tests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
@@ -676,9 +788,15 @@
},
}
-cc_prebuilt_library_shared {
+art_prebuilt_cc_prebuilt_library_shared {
name: "libjavacoretests",
- prefer: false,
+ // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
+ prefer: true,
+ soong_config_variables: {
+ source_build: {
+ prefer: false,
+ },
+ },
visibility: [
"//art/build/sdk",
"//cts/tests/libcore/luni",
diff --git a/current/test-exports/arm/lib/libjavacoretests.so b/current/test-exports/arm/lib/libjavacoretests.so
index b94680b..5669609 100755
--- a/current/test-exports/arm/lib/libjavacoretests.so
+++ b/current/test-exports/arm/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/arm64/lib/libjavacoretests.so b/current/test-exports/arm64/lib/libjavacoretests.so
index ca4eeb4..b113552 100755
--- a/current/test-exports/arm64/lib/libjavacoretests.so
+++ b/current/test-exports/arm64/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/java/core-ojtests-public.jar b/current/test-exports/java/core-ojtests-public.jar
index ef07d93..eca907e 100644
--- a/current/test-exports/java/core-ojtests-public.jar
+++ b/current/test-exports/java/core-ojtests-public.jar
Binary files differ
diff --git a/current/test-exports/java/core-tests.jar b/current/test-exports/java/core-tests.jar
index 43a5602..9eb013e 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/x86/lib/libjavacoretests.so b/current/test-exports/x86/lib/libjavacoretests.so
index 69b429f..651ba67 100755
--- a/current/test-exports/x86/lib/libjavacoretests.so
+++ b/current/test-exports/x86/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/x86_64/lib/libjavacoretests.so b/current/test-exports/x86_64/lib/libjavacoretests.so
index 4cc3e86..e0ff717 100755
--- a/current/test-exports/x86_64/lib/libjavacoretests.so
+++ b/current/test-exports/x86_64/lib/libjavacoretests.so
Binary files differ