Merge remote-tracking branch 'origin/Bitra.LA.3.2.1' into fp4t-qssi-0413
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 2f1c478..82ca2bb 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: "T1004275"
+ build_id: "T1005032"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.art/host-exports/art-module-host-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/art"
- git_branch: "tm-dev"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
index e6b1fd3..78fbd09 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: "T1004275"
+ build_id: "T1005032"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.art/sdk/art-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/art"
- git_branch: "tm-dev"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
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 5e6fc1f..7397e58 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: "T1004275"
+ build_id: "T1005032"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.art/test-exports/art-module-test-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/art"
- git_branch: "tm-dev"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 08c35ae..1f73c4b 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -1,15 +1,5 @@
// 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.
@@ -17,35 +7,11 @@
}
java_import {
- name: "art-module-host-exports_okhttp-norepackage@current",
- sdk_member_name: "okhttp-norepackage",
- visibility: [
- "//art/build/sdk",
- "//external/grpc-grpc-java/okhttp",
- "//external/okhttp",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-host-exports_external_okhttp_license@current"],
- host_supported: true,
- target: {
- android: {
- jars: ["java/android/okhttp-norepackage.jar"],
- },
- linux_glibc: {
- jars: ["java/linux_glibc/okhttp-norepackage.jar"],
- },
- },
-}
-
-art_prebuilt_java_import {
name: "okhttp-norepackage",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -67,30 +33,11 @@
}
java_import {
- name: "art-module-host-exports_art.module.api.annotations@current",
- sdk_member_name: "art.module.api.annotations",
- visibility: [
- "//art/build/sdk",
- "//external/icu/android_icu4j",
- "//frameworks/base",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-host-exports_libcore_license@current"],
- device_supported: false,
- host_supported: true,
- jars: ["java/art.module.api.annotations.jar"],
-}
-
-art_prebuilt_java_import {
name: "art.module.api.annotations",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -107,17 +54,6 @@
}
license {
- name: "art-module-host-exports_art_license@current",
- sdk_member_name: "art_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- ],
- license_text: ["licenses/art/NOTICE"],
-}
-
-license {
name: "art-module-host-exports_art_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -128,14 +64,6 @@
}
license {
- name: "art-module-host-exports_external_okhttp_license@current",
- sdk_member_name: "external_okhttp_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/external/okhttp/LICENSE.txt"],
-}
-
-license {
name: "art-module-host-exports_external_okhttp_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -143,28 +71,6 @@
}
license {
- name: "art-module-host-exports_libcore_license@current",
- sdk_member_name: "libcore_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OpenSSL",
- "SPDX-license-identifier-Unicode-DFS",
- "SPDX-license-identifier-W3C",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/libcore/LICENSE",
- "licenses/libcore/NOTICE",
- ],
-}
-
-license {
name: "art-module-host-exports_libcore_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -186,38 +92,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_dex2oat@current",
- sdk_member_name: "dex2oat",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/dex2oat64"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "dex2oat",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -241,35 +120,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_dex2oatd@current",
- sdk_member_name: "dex2oatd",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.art.debug"],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/dex2oatd64"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "dex2oatd",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.art.debug"],
@@ -290,42 +145,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_dexdump@current",
- sdk_member_name: "dexdump",
- visibility: [
- "//art:__subpackages__",
- "//development/build",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "libc++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/dexdump"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "dexdump",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -353,38 +177,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_hiddenapi@current",
- sdk_member_name: "hiddenapi",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/hiddenapi"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "hiddenapi",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -408,41 +205,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_oatdump@current",
- sdk_member_name: "oatdump",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/oatdump"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "oatdump",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -469,41 +236,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_profman@current",
- sdk_member_name: "profman",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/profman"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "profman",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -530,38 +267,11 @@
}
cc_prebuilt_binary {
- name: "art-module-host-exports_veridex@current",
- sdk_member_name: "veridex",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "libc++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/veridex"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_binary {
name: "veridex",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -585,52 +295,11 @@
}
cc_prebuilt_library {
- name: "art-module-host-exports_libartpalette@current",
- sdk_member_name: "libartpalette",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts/module_sdk/art/current/host-exports",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- "com.android.runtime",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- compile_multilib: "64",
- export_include_dirs: ["include/art/libartpalette/include"],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- static: {
- srcs: ["x86_64/lib/libartpalette.a"],
- },
- shared: {
- srcs: ["x86_64/lib/libartpalette.so"],
- shared_libs: [
- "libbase",
- "liblog",
- ],
- },
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library {
name: "libartpalette",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -668,59 +337,11 @@
}
cc_prebuilt_library {
- name: "art-module-host-exports_libartbase@current",
- sdk_member_name: "libartbase",
- visibility: [
- "//art:__subpackages__",
- "//packages/modules/NetworkStack/tests:__subpackages__",
- "//prebuilts/module_sdk/art/current/host-exports",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-host-exports_art_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- compile_multilib: "64",
- shared_libs: [
- "libbase",
- "libziparchive",
- "libz",
- "liblog",
- "art-module-host-exports_libartpalette@current",
- ],
- export_include_dirs: [
- "include/art/libartbase",
- "include/system/libbase/include",
- "include/external/fmtlib/include",
- ],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- static: {
- srcs: ["x86_64/lib/libartbase.a"],
- },
- shared: {
- srcs: ["x86_64/lib/libartbase.so"],
- },
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library {
name: "libartbase",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -763,40 +384,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "art-module-host-exports@current",
- visibility: ["//art:__subpackages__"],
- host_supported: true,
- target: {
- android: {
- java_libs: ["art-module-host-exports_okhttp-norepackage@current"],
- },
- linux_glibc: {
- compile_multilib: "64",
- java_libs: [
- "art-module-host-exports_okhttp-norepackage@current",
- "art-module-host-exports_art.module.api.annotations@current",
- ],
- native_binaries: [
- "art-module-host-exports_dex2oat@current",
- "art-module-host-exports_dex2oatd@current",
- "art-module-host-exports_dexdump@current",
- "art-module-host-exports_hiddenapi@current",
- "art-module-host-exports_oatdump@current",
- "art-module-host-exports_profman@current",
- "art-module-host-exports_veridex@current",
- ],
- native_libs: [
- "art-module-host-exports_libartpalette@current",
- "art-module-host-exports_libartbase@current",
- ],
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/current/host-exports/include/art/libartbase/base/metrics/metrics.h b/current/host-exports/include/art/libartbase/base/metrics/metrics.h
index d6f2463..266534c 100644
--- a/current/host-exports/include/art/libartbase/base/metrics/metrics.h
+++ b/current/host-exports/include/art/libartbase/base/metrics/metrics.h
@@ -55,7 +55,15 @@
METRIC(YoungGcThroughput, MetricsHistogram, 15, 0, 10'000) \
METRIC(FullGcThroughput, MetricsHistogram, 15, 0, 10'000) \
METRIC(YoungGcTracingThroughput, MetricsHistogram, 15, 0, 10'000) \
- METRIC(FullGcTracingThroughput, MetricsHistogram, 15, 0, 10'000)
+ METRIC(FullGcTracingThroughput, MetricsHistogram, 15, 0, 10'000) \
+ METRIC(GcWorldStopTime, MetricsCounter) \
+ METRIC(GcWorldStopCount, MetricsCounter) \
+ METRIC(YoungGcScannedBytes, MetricsCounter) \
+ METRIC(YoungGcFreedBytes, MetricsCounter) \
+ METRIC(YoungGcDuration, MetricsCounter) \
+ METRIC(FullGcScannedBytes, MetricsCounter) \
+ METRIC(FullGcFreedBytes, MetricsCounter) \
+ METRIC(FullGcDuration, MetricsCounter)
// A lot of the metrics implementation code is generated by passing one-off macros into ART_COUNTERS
// and ART_HISTOGRAMS. This means metrics.h and metrics.cc are very #define-heavy, which can be
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index e6f199a..bdc0d66 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762355
\ No newline at end of file
+9106705
\ 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 49a2004..88cec63 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 4106966..72f9d89 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/hiddenapi b/current/host-exports/x86_64/bin/hiddenapi
index 68364cb..d5bbe9c 100755
--- a/current/host-exports/x86_64/bin/hiddenapi
+++ b/current/host-exports/x86_64/bin/hiddenapi
Binary files differ
diff --git a/current/host-exports/x86_64/bin/oatdump b/current/host-exports/x86_64/bin/oatdump
index 9944514..267e3e0 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/lib/libartbase.a b/current/host-exports/x86_64/lib/libartbase.a
index 40f9876..cd8d1ff 100644
--- a/current/host-exports/x86_64/lib/libartbase.a
+++ b/current/host-exports/x86_64/lib/libartbase.a
Binary files differ
diff --git a/current/host-exports/x86_64/lib/libartbase.so b/current/host-exports/x86_64/lib/libartbase.so
index ca5442c..2cc3870 100755
--- a/current/host-exports/x86_64/lib/libartbase.so
+++ b/current/host-exports/x86_64/lib/libartbase.so
Binary files differ
diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp
index bbd90ed..cdfb46a 100644
--- a/current/sdk/Android.bp
+++ b/current/sdk/Android.bp
@@ -1,21 +1,5 @@
// 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",
- "art_prebuilt_prebuilt_systemserverclasspath_fragment",
- ],
-}
-
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,54 +7,11 @@
}
prebuilt_bootclasspath_fragment {
- name: "art-module-sdk_art-bootclasspath-fragment@current",
- sdk_member_name: "art-bootclasspath-fragment",
- visibility: [
- "//art/build/apex",
- "//art/build/boot",
- "//art/build/sdk",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- image_name: "art",
- contents: [
- "art-module-sdk_core-oj@current",
- "art-module-sdk_core-libart@current",
- "art-module-sdk_okhttp@current",
- "art-module-sdk_bouncycastle@current",
- "art-module-sdk_apache-xml@current",
- ],
- api: {
- stub_libs: ["art-module-sdk_art.module.public.api@current"],
- },
- core_platform_api: {
- 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"],
- blocked: ["hiddenapi/hiddenapi-blocked.txt"],
- unsupported_packages: ["hiddenapi/hiddenapi-unsupported-packages.txt"],
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
-art_prebuilt_prebuilt_bootclasspath_fragment {
name: "art-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -111,26 +52,11 @@
}
prebuilt_platform_compat_config {
- name: "art-module-sdk_libcore-platform-compat-config@current",
- sdk_member_name: "libcore-platform-compat-config",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- metadata: "compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml",
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -143,33 +69,11 @@
}
java_import {
- name: "art-module-sdk_core-oj@current",
- sdk_member_name: "core-oj",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/wycheproof",
- "//libcore",
- "//libcore/benchmarks",
- "//packages/modules/ArtPrebuilt",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/core-oj.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-oj",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -189,33 +93,11 @@
}
java_import {
- name: "art-module-sdk_core-libart@current",
- sdk_member_name: "core-libart",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/wycheproof",
- "//libcore",
- "//libcore/benchmarks",
- "//packages/modules/ArtPrebuilt",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/core-libart.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-libart",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -235,34 +117,11 @@
}
java_import {
- name: "art-module-sdk_okhttp@current",
- sdk_member_name: "okhttp",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/grpc-grpc-java/okhttp",
- "//external/okhttp",
- "//external/robolectric-shadows",
- "//libcore",
- "//packages/modules/ArtPrebuilt",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_external_okhttp_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/okhttp.jar"],
-}
-
-art_prebuilt_java_import {
name: "okhttp",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -283,33 +142,11 @@
}
java_import {
- name: "art-module-sdk_bouncycastle@current",
- sdk_member_name: "bouncycastle",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/bouncycastle",
- "//external/wycheproof",
- "//libcore",
- "//packages/modules/ArtPrebuilt",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_external_bouncycastle_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/bouncycastle.jar"],
-}
-
-art_prebuilt_java_import {
name: "bouncycastle",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -329,32 +166,11 @@
}
java_import {
- name: "art-module-sdk_apache-xml@current",
- sdk_member_name: "apache-xml",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/apache-xml",
- "//libcore",
- "//packages/modules/ArtPrebuilt",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_external_apache-xml_license@current"],
- jars: ["java_boot_libs/snapshot/jars/are/invalid/apache-xml.jar"],
-}
-
-art_prebuilt_java_import {
name: "apache-xml",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -373,22 +189,11 @@
}
java_import {
- name: "art-module-sdk_core-lambda-stubs@current",
- sdk_member_name: "core-lambda-stubs",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/core-lambda-stubs.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-lambda-stubs",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
@@ -397,27 +202,11 @@
}
java_import {
- name: "art-module-sdk_core-lambda-stubs-for-system-modules@current",
- sdk_member_name: "core-lambda-stubs-for-system-modules",
- visibility: [
- "//art/build/sdk",
- "//build/soong/java/core-libraries",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/core-lambda-stubs-for-system-modules.jar"],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -431,27 +220,11 @@
}
java_import {
- name: "art-module-sdk_core-generated-annotation-stubs@current",
- sdk_member_name: "core-generated-annotation-stubs",
- visibility: [
- "//art/build/sdk",
- "//build/soong/java/core-libraries",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/core-generated-annotation-stubs.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-generated-annotation-stubs",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -465,22 +238,11 @@
}
java_import {
- name: "art-module-sdk_art.module.api.annotations.for.system.modules@current",
- sdk_member_name: "art.module.api.annotations.for.system.modules",
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/art.module.api.annotations.for.system.modules.jar"],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
@@ -489,22 +251,11 @@
}
java_import {
- name: "art-module-sdk_stub-annotations@current",
- sdk_member_name: "stub-annotations",
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_Android-Apache-2.0@current"],
- jars: ["java/stub-annotations.jar"],
-}
-
-art_prebuilt_java_import {
name: "art-module-sdk_stub-annotations",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
@@ -513,22 +264,11 @@
}
java_import {
- name: "art-module-sdk_art.module.intra.core.api.stubs@current",
- sdk_member_name: "art.module.intra.core.api.stubs",
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/art.module.intra.core.api.stubs.jar"],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
@@ -537,22 +277,11 @@
}
java_import {
- name: "art-module-sdk_art-module-intra-core-api-stubs-system-modules-lib@current",
- sdk_member_name: "art-module-intra-core-api-stubs-system-modules-lib",
- visibility: ["//visibility:private"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- jars: ["java/art-module-intra-core-api-stubs-system-modules-lib.jar"],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:private"],
apex_available: ["//apex_available:platform"],
@@ -561,55 +290,11 @@
}
java_sdk_library_import {
- name: "art-module-sdk_art.module.public.api@current",
- sdk_member_name: "art.module.public.api",
- visibility: [
- "//art/build/sdk",
- "//build/soong/java/core-libraries",
- "//frameworks/base",
- "//frameworks/base/api",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libcore_license@current"],
- shared_library: false,
- compile_dex: true,
- doctag_files: ["doctags/known_oj_tags.txt"],
- public: {
- jars: ["sdk_library/public/art.module.public.api-stubs.jar"],
- 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: {
- jars: ["sdk_library/system/art.module.public.api-stubs.jar"],
- 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: {
- jars: ["sdk_library/module-lib/art.module.public.api-stubs.jar"],
- 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",
- },
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -617,6 +302,7 @@
"//frameworks/base",
"//frameworks/base/api",
"//libcore",
+ "//libcore/mmodules/core_platform_api",
"//prebuilts:__subpackages__",
],
apex_available: ["//apex_available:platform"],
@@ -651,43 +337,11 @@
}
java_sdk_library_import {
- name: "art-module-sdk_service-art@current",
- sdk_member_name: "service-art",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- shared_library: false,
- compile_dex: true,
- permitted_packages: ["com.android.server.art"],
- public: {
- jars: ["sdk_library/public/service-art-stubs.jar"],
- stub_srcs: ["sdk_library/public/service-art.srcjar"],
- current_api: "sdk_library/public/service-art.txt",
- removed_api: "sdk_library/public/service-art-removed.txt",
- annotations: "sdk_library/public/service-art_annotations.zip",
- sdk_version: "core_current",
- },
- system_server: {
- jars: ["sdk_library/system-server/service-art-stubs.jar"],
- stub_srcs: ["sdk_library/system-server/service-art.srcjar"],
- current_api: "sdk_library/system-server/service-art.txt",
- removed_api: "sdk_library/system-server/service-art-removed.txt",
- annotations: "sdk_library/system-server/service-art_annotations.zip",
- sdk_version: "core_current",
- },
-}
-
-art_prebuilt_java_sdk_library_import {
name: "service-art",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -696,7 +350,6 @@
],
licenses: ["art-module-sdk_art_license"],
shared_library: false,
- compile_dex: true,
permitted_packages: ["com.android.server.art"],
public: {
jars: ["sdk_library/public/service-art-stubs.jar"],
@@ -704,7 +357,7 @@
current_api: "sdk_library/public/service-art.txt",
removed_api: "sdk_library/public/service-art-removed.txt",
annotations: "sdk_library/public/service-art_annotations.zip",
- sdk_version: "core_current",
+ sdk_version: "module_current",
},
system_server: {
jars: ["sdk_library/system-server/service-art-stubs.jar"],
@@ -712,39 +365,16 @@
current_api: "sdk_library/system-server/service-art.txt",
removed_api: "sdk_library/system-server/service-art-removed.txt",
annotations: "sdk_library/system-server/service-art_annotations.zip",
- sdk_version: "core_current",
+ sdk_version: "system_server_current",
},
}
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",
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//external/wycheproof",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- libs: [
- "art-module-sdk_art.module.public.api.stubs@current",
- "art-module-sdk_core-lambda-stubs-for-system-modules@current",
- "art-module-sdk_core-generated-annotation-stubs@current",
- "art-module-sdk_art.module.api.annotations.for.system.modules@current",
- "art-module-sdk_stub-annotations@current",
- ],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -765,27 +395,11 @@
}
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 the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -799,31 +413,11 @@
}
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: [
- "//art/build/sdk",
- "//external/bouncycastle",
- "//external/conscrypt",
- "//external/icu/android_icu4j",
- "//libcore/mmodules/intracoreapi",
- "//prebuilts:__subpackages__",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- libs: [
- "art-module-sdk_art.module.intra.core.api.stubs@current",
- "art-module-sdk_art-module-intra-core-api-stubs-system-modules-lib@current",
- ],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -841,17 +435,6 @@
}
license {
- name: "art-module-sdk_art_license@current",
- sdk_member_name: "art_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- ],
- license_text: ["licenses/art/NOTICE"],
-}
-
-license {
name: "art-module-sdk_art_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -862,14 +445,6 @@
}
license {
- name: "art-module-sdk_libnativehelper_license@current",
- sdk_member_name: "libnativehelper_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/libnativehelper/NOTICE"],
-}
-
-license {
name: "art-module-sdk_libnativehelper_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -877,17 +452,6 @@
}
license {
- name: "art-module-sdk_art_openjdkjvmti_license@current",
- sdk_member_name: "art_openjdkjvmti_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-GPL-with-classpath-exception",
- ],
- license_text: ["licenses/art/openjdkjvmti/NOTICE"],
-}
-
-license {
name: "art-module-sdk_art_openjdkjvmti_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -898,28 +462,6 @@
}
license {
- name: "art-module-sdk_libcore_license@current",
- sdk_member_name: "libcore_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OpenSSL",
- "SPDX-license-identifier-Unicode-DFS",
- "SPDX-license-identifier-W3C",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/libcore/LICENSE",
- "licenses/libcore/NOTICE",
- ],
-}
-
-license {
name: "art-module-sdk_libcore_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -941,14 +483,6 @@
}
license {
- name: "art-module-sdk_external_okhttp_license@current",
- sdk_member_name: "external_okhttp_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/external/okhttp/LICENSE.txt"],
-}
-
-license {
name: "art-module-sdk_external_okhttp_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -956,18 +490,6 @@
}
license {
- name: "art-module-sdk_external_bouncycastle_license@current",
- sdk_member_name: "external_bouncycastle_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-MIT",
- ],
- license_text: ["licenses/external/bouncycastle/NOTICE"],
-}
-
-license {
name: "art-module-sdk_external_bouncycastle_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -979,17 +501,6 @@
}
license {
- name: "art-module-sdk_external_apache-xml_license@current",
- sdk_member_name: "external_apache-xml_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-W3C",
- ],
- license_text: ["licenses/external/apache-xml/NOTICE"],
-}
-
-license {
name: "art-module-sdk_external_apache-xml_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -1000,14 +511,6 @@
}
license {
- name: "art-module-sdk_Android-Apache-2.0@current",
- sdk_member_name: "Android-Apache-2.0",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
name: "art-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -1015,45 +518,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_jni_headers@current",
- sdk_member_name: "jni_headers",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["art-module-sdk_libnativehelper_license@current"],
- host_supported: true,
- native_bridge_supported: true,
- ramdisk_available: true,
- recovery_available: true,
- vendor_available: true,
- sdk_version: "minimum",
- stl: "none",
- compile_multilib: "both",
- system_shared_libs: [],
- export_include_dirs: ["common_os/include/libnativehelper/include_jni"],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_headers {
name: "jni_headers",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -1085,39 +554,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_libartpalette-headers@current",
- sdk_member_name: "libartpalette-headers",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- "//system/libartpalette",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- compile_multilib: "both",
- export_include_dirs: ["common_os/include/art/libartpalette/include"],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_headers {
name: "libartpalette-headers",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -1143,42 +584,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_libnativehelper_header_only@current",
- sdk_member_name: "libnativehelper_header_only",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["art-module-sdk_libnativehelper_license@current"],
- host_supported: true,
- sdk_version: "minimum",
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/libnativehelper/header_only_include",
- "common_os/include/libnativehelper/include_jni",
- ],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -1207,43 +617,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_libopenjdkjvmti_headers@current",
- sdk_member_name: "libopenjdkjvmti_headers",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_openjdkjvmti_license@current"],
- host_supported: true,
- sdk_version: "current",
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/art/openjdkjvmti/include",
- "common_os/include/libnativehelper/include_jni",
- ],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_headers {
name: "libopenjdkjvmti_headers",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -1273,38 +651,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_odrefresh_headers@current",
- sdk_member_name: "odrefresh_headers",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- sdk_version: "minimum",
- stl: "none",
- compile_multilib: "both",
- system_shared_libs: [],
- export_include_dirs: ["common_os/include/art/odrefresh/include"],
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_headers {
name: "odrefresh_headers",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
@@ -1329,37 +680,11 @@
}
cc_prebuilt_library_headers {
- name: "art-module-sdk_libnativeloader-headers@current",
- sdk_member_name: "libnativeloader-headers",
- visibility: [
- "//art:__subpackages__",
- "//frameworks/av/media/libstagefright",
- "//frameworks/native/libs/graphicsenv",
- "//frameworks/native/vulkan/libvulkan",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.art",
- "com.android.art.debug",
- "com.android.media",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- compile_multilib: "both",
- export_include_dirs: [
- "include/art/libnativeloader/include",
- "include/libnativehelper/include_jni",
- ],
-}
-
-art_prebuilt_cc_prebuilt_library_headers {
name: "libnativeloader-headers",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -1383,64 +708,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libandroidio@current",
- sdk_member_name: "libandroidio",
- visibility: [
- "//art/build/apex",
- "//art/build/sdk",
- "//external/conscrypt",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_libcore_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libandroidio.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libandroidio.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libandroidio.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libandroidio.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libandroidio.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libandroidio.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libandroidio",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/apex",
@@ -1490,73 +762,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libdexfile@current",
- 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",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/art/libdexfile",
- "common_os/include/libnativehelper/include_jni",
- "common_os/include/art/libdexfile/external/include",
- "common_os/include/system/libbase/include",
- "common_os/include/external/fmtlib/include",
- "common_os/include/art/libartbase",
- ],
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libdexfile.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libdexfile.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libdexfile.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libdexfile.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libdexfile.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libdexfile.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libdexfile",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -1615,67 +825,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativebridge@current",
- sdk_member_name: "libnativebridge",
- visibility: [
- "//art:__subpackages__",
- "//frameworks/base/cmds/app_process",
- "//frameworks/base/native/webview/loader/libwebviewchromium_loader",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/art/libnativebridge/include",
- "common_os/include/libnativehelper/include_jni",
- ],
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libnativebridge.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libnativebridge.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libnativebridge.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libnativebridge.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libnativebridge.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libnativebridge.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -1728,66 +882,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativehelper@current",
- sdk_member_name: "libnativehelper",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_libnativehelper_license@current"],
- host_supported: true,
- installable: false,
- stl: "none",
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/libnativehelper/header_only_include",
- "common_os/include/libnativehelper/include",
- "common_os/include/libnativehelper/include_jni",
- "common_os/include/libnativehelper/include_platform",
- "common_os/include/libnativehelper/include_platform_header_only",
- ],
- stubs: {
- versions: [
- "31",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libnativehelper.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libnativehelper.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libnativehelper.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libnativehelper.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libnativehelper.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libnativehelper.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -1839,67 +938,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativeloader@current",
- sdk_member_name: "libnativeloader",
- visibility: [
- "//art:__subpackages__",
- "//frameworks/base/cmds/app_process",
- "//frameworks/base/native/webview/loader",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/art/libnativeloader/include",
- "common_os/include/libnativehelper/include_jni",
- ],
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libnativeloader.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libnativeloader.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libnativeloader.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libnativeloader.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libnativeloader.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libnativeloader.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -1952,63 +995,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libsigchain@current",
- sdk_member_name: "libsigchain",
- visibility: [
- "//art:__subpackages__",
- "//frameworks/base/cmds/app_process",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- export_include_dirs: ["common_os/include/art/sigchainlib"],
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libsigchain.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libsigchain.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libsigchain.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libsigchain.so"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libsigchain.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libsigchain.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libsigchain",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -2057,53 +1048,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativebridge_lazy@current",
- sdk_member_name: "libnativebridge_lazy",
- visibility: [
- "//art/libnativebridge/tests",
- "//art:__subpackages__",
- "//frameworks/base/core/jni",
- "//frameworks/native/opengl/libs",
- "//frameworks/native/vulkan/libvulkan",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.media",
- "com.android.media.swcodec",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- installable: false,
- compile_multilib: "both",
- shared_libs: ["liblog"],
- export_include_dirs: [
- "include/libnativehelper/include_jni",
- "include/art/libnativebridge/include",
- ],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libnativebridge_lazy.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libnativebridge_lazy.so"],
- },
- arm: {
- srcs: ["arm/lib/libnativebridge_lazy.so"],
- },
- x86: {
- srcs: ["x86/lib/libnativebridge_lazy.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativebridge_lazy",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/libnativebridge/tests",
@@ -2142,65 +1091,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativehelper_compat_libc++@current",
- sdk_member_name: "libnativehelper_compat_libc++",
- visibility: [
- "//art:__subpackages__",
- "//cts:__subpackages__",
- "//external/perfetto:__subpackages__",
- "//frameworks/base/packages/Connectivity/tests/integration",
- "//frameworks/base/packages/ConnectivityT:__subpackages__",
- "//frameworks/base/packages/Tethering:__subpackages__",
- "//frameworks/libs/net/common/native/bpfmapjni",
- "//frameworks/libs/net/common/native/bpfutiljni",
- "//libcore:__subpackages__",
- "//libnativehelper:__subpackages__",
- "//packages/modules/Connectivity:__subpackages__",
- "//packages/modules/ExtServices:__subpackages__",
- "//packages/modules/NetworkStack:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.art",
- "com.android.art.debug",
- "com.android.extservices",
- "com.android.tethering",
- ],
- licenses: ["art-module-sdk_libnativehelper_license@current"],
- installable: false,
- stl: "none",
- compile_multilib: "both",
- shared_libs: ["liblog"],
- export_include_dirs: [
- "include/libnativehelper/header_only_include",
- "include/libnativehelper/include",
- "include/libnativehelper/include_jni",
- ],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libnativehelper_compat_libc++.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libnativehelper_compat_libc++.so"],
- },
- arm: {
- srcs: ["arm/lib/libnativehelper_compat_libc++.so"],
- },
- x86: {
- srcs: ["x86/lib/libnativehelper_compat_libc++.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativehelper_compat_libc++",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -2251,52 +1146,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-sdk_libnativeloader_lazy@current",
- sdk_member_name: "libnativeloader_lazy",
- visibility: [
- "//art:__subpackages__",
- "//frameworks/base/core/jni",
- "//frameworks/native/opengl/libs",
- "//frameworks/native/vulkan/libvulkan",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.media",
- "com.android.media.swcodec",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- installable: false,
- compile_multilib: "both",
- shared_libs: ["liblog"],
- export_include_dirs: [
- "include/art/libnativeloader/include",
- "include/libnativehelper/include_jni",
- ],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libnativeloader_lazy.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libnativeloader_lazy.so"],
- },
- arm: {
- srcs: ["arm/lib/libnativeloader_lazy.so"],
- },
- x86: {
- srcs: ["x86/lib/libnativeloader_lazy.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libnativeloader_lazy",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -2334,65 +1188,11 @@
}
cc_prebuilt_library_static {
- name: "art-module-sdk_libdexfile_support@current",
- sdk_member_name: "libdexfile_support",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.art",
- "com.android.art.debug",
- "com.android.media",
- "com.android.media.swcodec",
- "com.android.runtime",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- shared_libs: [
- "liblog",
- "libbase",
- ],
- export_include_dirs: [
- "common_os/include/art/libdexfile/external/include",
- "common_os/include/system/libbase/include",
- "common_os/include/external/fmtlib/include",
- ],
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libdexfile_support.a"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libdexfile_support.a"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libdexfile_support.a"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libdexfile_support.a"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libdexfile_support.a"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libdexfile_support.a"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_static {
name: "libdexfile_support",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -2443,67 +1243,11 @@
}
cc_prebuilt_library_static {
- name: "art-module-sdk_libdexfile_static@current",
- sdk_member_name: "libdexfile_static",
- visibility: [
- "//art:__subpackages__",
- "//cts/tests/tests/simpleperf",
- "//prebuilts:__subpackages__",
- "//system/extras/simpleperf",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_art_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- export_include_dirs: [
- "common_os/include/system/libbase/include",
- "common_os/include/external/fmtlib/include",
- "common_os/include/art/libartpalette/include",
- "common_os/include/system/logging/liblog/include",
- "common_os/include/external/zlib",
- "common_os/include/system/libziparchive/include",
- "common_os/include/external/googletest/googletest/include",
- "common_os/include/art/libartbase",
- "common_os/include/art/libdexfile",
- "common_os/include/libnativehelper/include_jni",
- "common_os/include/art/libdexfile/external/include",
- ],
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libdexfile_static.a"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libdexfile_static.a"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libdexfile_static.a"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libdexfile_static.a"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libdexfile_static.a"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libdexfile_static.a"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_static {
name: "libdexfile_static",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -2556,57 +1300,11 @@
}
cc_prebuilt_library_static {
- name: "art-module-sdk_libnativehelper_lazy@current",
- sdk_member_name: "libnativehelper_lazy",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-sdk_libnativehelper_license@current"],
- host_supported: true,
- installable: false,
- compile_multilib: "both",
- shared_libs: ["liblog"],
- export_include_dirs: [
- "common_os/include/libnativehelper/header_only_include",
- "common_os/include/libnativehelper/include",
- "common_os/include/libnativehelper/include_jni",
- "common_os/include/libnativehelper/include_platform",
- "common_os/include/libnativehelper/include_platform_header_only",
- ],
- target: {
- host: {
- enabled: false,
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libnativehelper_lazy.a"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libnativehelper_lazy.a"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libnativehelper_lazy.a"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libnativehelper_lazy.a"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libnativehelper_lazy.a"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libnativehelper_lazy.a"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_static {
name: "libnativehelper_lazy",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
@@ -2649,28 +1347,11 @@
}
prebuilt_systemserverclasspath_fragment {
- name: "art-module-sdk_art-systemserverclasspath-fragment@current",
- sdk_member_name: "art-systemserverclasspath-fragment",
- visibility: [
- "//art:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- licenses: ["art-module-sdk_art_license@current"],
- contents: ["art-module-sdk_service-art@current"],
-}
-
-art_prebuilt_prebuilt_systemserverclasspath_fragment {
name: "art-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -2683,87 +1364,3 @@
licenses: ["art-module-sdk_art_license"],
contents: ["service-art"],
}
-
-sdk_snapshot {
- name: "art-module-sdk@current",
- visibility: ["//art:__subpackages__"],
- host_supported: true,
- native_static_libs: [
- "art-module-sdk_libdexfile_support@current",
- "art-module-sdk_libdexfile_static@current",
- "art-module-sdk_libnativehelper_lazy@current",
- ],
- target: {
- android: {
- bootclasspath_fragments: ["art-module-sdk_art-bootclasspath-fragment@current"],
- compat_configs: ["art-module-sdk_libcore-platform-compat-config@current"],
- java_boot_libs: [
- "art-module-sdk_core-oj@current",
- "art-module-sdk_core-libart@current",
- "art-module-sdk_okhttp@current",
- "art-module-sdk_bouncycastle@current",
- "art-module-sdk_apache-xml@current",
- ],
- java_header_libs: [
- "art-module-sdk_core-lambda-stubs@current",
- "art-module-sdk_core-lambda-stubs-for-system-modules@current",
- "art-module-sdk_core-generated-annotation-stubs@current",
- ],
- java_sdk_libs: [
- "art-module-sdk_art.module.public.api@current",
- "art-module-sdk_service-art@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",
- ],
- native_header_libs: [
- "art-module-sdk_jni_headers@current",
- "art-module-sdk_libartpalette-headers@current",
- "art-module-sdk_libnativehelper_header_only@current",
- "art-module-sdk_libopenjdkjvmti_headers@current",
- "art-module-sdk_odrefresh_headers@current",
- "art-module-sdk_libnativeloader-headers@current",
- ],
- native_shared_libs: [
- "art-module-sdk_libandroidio@current",
- "art-module-sdk_libdexfile@current",
- "art-module-sdk_libnativebridge@current",
- "art-module-sdk_libnativehelper@current",
- "art-module-sdk_libnativeloader@current",
- "art-module-sdk_libsigchain@current",
- "art-module-sdk_libnativebridge_lazy@current",
- "art-module-sdk_libnativehelper_compat_libc++@current",
- "art-module-sdk_libnativeloader_lazy@current",
- ],
- systemserverclasspath_fragments: ["art-module-sdk_art-systemserverclasspath-fragment@current"],
- },
- linux_glibc: {
- native_header_libs: [
- "art-module-sdk_jni_headers@current",
- "art-module-sdk_libartpalette-headers@current",
- "art-module-sdk_libnativehelper_header_only@current",
- "art-module-sdk_libopenjdkjvmti_headers@current",
- "art-module-sdk_odrefresh_headers@current",
- ],
- native_shared_libs: [
- "art-module-sdk_libandroidio@current",
- "art-module-sdk_libdexfile@current",
- "art-module-sdk_libnativebridge@current",
- "art-module-sdk_libnativehelper@current",
- "art-module-sdk_libnativeloader@current",
- "art-module-sdk_libsigchain@current",
- ],
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
diff --git a/current/sdk/android/arm/lib/libdexfile_static.a b/current/sdk/android/arm/lib/libdexfile_static.a
index 262b72f..9c076e4 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 d0b851c..8df917d 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 c11915e..0477df6 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_64/lib/libdexfile_static.a b/current/sdk/android/x86_64/lib/libdexfile_static.a
index 7409e3e..ecc59a6 100644
--- a/current/sdk/android/x86_64/lib/libdexfile_static.a
+++ b/current/sdk/android/x86_64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/arm/lib/libnativebridge_lazy.so b/current/sdk/arm/lib/libnativebridge_lazy.so
index 2d43169..5713576 100755
--- a/current/sdk/arm/lib/libnativebridge_lazy.so
+++ b/current/sdk/arm/lib/libnativebridge_lazy.so
Binary files differ
diff --git a/current/sdk/arm/lib/libnativehelper_compat_libc++.so b/current/sdk/arm/lib/libnativehelper_compat_libc++.so
index b9c74b6..e503884 100755
--- a/current/sdk/arm/lib/libnativehelper_compat_libc++.so
+++ b/current/sdk/arm/lib/libnativehelper_compat_libc++.so
Binary files differ
diff --git a/current/sdk/arm/lib/libnativeloader_lazy.so b/current/sdk/arm/lib/libnativeloader_lazy.so
index f04ee02..69063c4 100755
--- a/current/sdk/arm/lib/libnativeloader_lazy.so
+++ b/current/sdk/arm/lib/libnativeloader_lazy.so
Binary files differ
diff --git a/current/sdk/arm64/lib/libnativebridge_lazy.so b/current/sdk/arm64/lib/libnativebridge_lazy.so
index c961297..0263c95 100755
--- a/current/sdk/arm64/lib/libnativebridge_lazy.so
+++ b/current/sdk/arm64/lib/libnativebridge_lazy.so
Binary files differ
diff --git a/current/sdk/arm64/lib/libnativehelper_compat_libc++.so b/current/sdk/arm64/lib/libnativehelper_compat_libc++.so
index f0eba6d..b4699b0 100755
--- a/current/sdk/arm64/lib/libnativehelper_compat_libc++.so
+++ b/current/sdk/arm64/lib/libnativehelper_compat_libc++.so
Binary files differ
diff --git a/current/sdk/arm64/lib/libnativeloader_lazy.so b/current/sdk/arm64/lib/libnativeloader_lazy.so
index a1c00f7..213b73c 100755
--- a/current/sdk/arm64/lib/libnativeloader_lazy.so
+++ b/current/sdk/arm64/lib/libnativeloader_lazy.so
Binary files differ
diff --git a/current/sdk/common_os/include/art/libartbase/base/metrics/metrics.h b/current/sdk/common_os/include/art/libartbase/base/metrics/metrics.h
index d6f2463..266534c 100644
--- a/current/sdk/common_os/include/art/libartbase/base/metrics/metrics.h
+++ b/current/sdk/common_os/include/art/libartbase/base/metrics/metrics.h
@@ -55,7 +55,15 @@
METRIC(YoungGcThroughput, MetricsHistogram, 15, 0, 10'000) \
METRIC(FullGcThroughput, MetricsHistogram, 15, 0, 10'000) \
METRIC(YoungGcTracingThroughput, MetricsHistogram, 15, 0, 10'000) \
- METRIC(FullGcTracingThroughput, MetricsHistogram, 15, 0, 10'000)
+ METRIC(FullGcTracingThroughput, MetricsHistogram, 15, 0, 10'000) \
+ METRIC(GcWorldStopTime, MetricsCounter) \
+ METRIC(GcWorldStopCount, MetricsCounter) \
+ METRIC(YoungGcScannedBytes, MetricsCounter) \
+ METRIC(YoungGcFreedBytes, MetricsCounter) \
+ METRIC(YoungGcDuration, MetricsCounter) \
+ METRIC(FullGcScannedBytes, MetricsCounter) \
+ METRIC(FullGcFreedBytes, MetricsCounter) \
+ METRIC(FullGcDuration, MetricsCounter)
// A lot of the metrics implementation code is generated by passing one-off macros into ART_COUNTERS
// and ART_HISTOGRAMS. This means metrics.h and metrics.cc are very #define-heavy, which can be
diff --git a/current/sdk/compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml b/current/sdk/compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml
index 7e55cbd..08de16f 100644
--- a/current/sdk/compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml
+++ b/current/sdk/compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml
@@ -1,2 +1,21 @@
<?xml version='1.0' encoding='utf-8'?>
-<config><compat-change description="Remove meta-reflection workaround for hidden api usage for apps targeting R+. This allowed apps to obtain references to blocklist fields and methods through an extra layer of reflection." enableSinceTargetSdk="30" id="142365358" name="PREVENT_META_REFLECTION_BLOCKLIST_ACCESS"><meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:74" /></compat-change><compat-change description="Gating access to greylist-max-p APIs." enableSinceTargetSdk="29" id="149997251" name="HIDE_MAXTARGETSDK_P_HIDDEN_APIS"><meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:82" /></compat-change><compat-change description="Gating access to greylist-max-q APIs." enableSinceTargetSdk="30" id="149994052" name="HIDE_MAXTARGETSDK_Q_HIDDEN_APIS"><meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:89" /></compat-change><compat-change description="Allow apps accessing @TestApi APIs. <p>This will always be disabled by default and should only be used by platform test code." disabled="true" id="166236554" name="ALLOW_TEST_API_ACCESS"><meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:98" /></compat-change><compat-change description="If this change is enabled, {@link #getHardwareAddress()} returns null when the hardware address is <a href="#access-restrictions">inaccessible</a>. If the change is disabled, the default MAC address (02:00:00:00:00:00) is returned instead." enableSinceTargetSdk="30" id="170188668" name="RETURN_NULL_HARDWARE_ADDRESS"><meta-data definedIn="java.net.NetworkInterface" sourcePosition="libcore/ojluni/src/main/java/java/net/NetworkInterface.java:79" /></compat-change><compat-change description="Since Android 11, formatter classes, e.g. java.text.SimpleDateFormat, no longer provide English data when Locale.ROOT format is requested. Please use Locale.ENGLISH to format in English. Note that Locale.ROOT is used as language/country neutral locale or fallback locale, and does not guarantee to represent English locale. This flag is only for documentation and can't be overridden by app. Please use {@code targetSdkVersion} to enable the new behavior." enableAfterTargetSdk="29" id="159047832" name="USE_REAL_ROOT_LOCALE"><meta-data definedIn="libcore.icu.LocaleData" sourcePosition="libcore/luni/src/main/java/libcore/icu/LocaleData.java:76" /></compat-change></config>
\ No newline at end of file
+<config>
+ <compat-change description="Remove meta-reflection workaround for hidden api usage for apps targeting R+. This allowed apps to obtain references to blocklist fields and methods through an extra layer of reflection." enableSinceTargetSdk="30" id="142365358" name="PREVENT_META_REFLECTION_BLOCKLIST_ACCESS">
+ <meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:74" />
+ </compat-change>
+ <compat-change description="Gating access to greylist-max-p APIs." enableSinceTargetSdk="29" id="149997251" name="HIDE_MAXTARGETSDK_P_HIDDEN_APIS">
+ <meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:82" />
+ </compat-change>
+ <compat-change description="Gating access to greylist-max-q APIs." enableSinceTargetSdk="30" id="149994052" name="HIDE_MAXTARGETSDK_Q_HIDDEN_APIS">
+ <meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:89" />
+ </compat-change>
+ <compat-change description="Allow apps accessing @TestApi APIs. <p>This will always be disabled by default and should only be used by platform test code." disabled="true" id="166236554" name="ALLOW_TEST_API_ACCESS">
+ <meta-data definedIn="dalvik.system.VMRuntime" sourcePosition="libcore/libart/src/main/java/dalvik/system/VMRuntime.java:98" />
+ </compat-change>
+ <compat-change description="If this change is enabled, {@link #getHardwareAddress()} returns null when the hardware address is <a href="#access-restrictions">inaccessible</a>. If the change is disabled, the default MAC address (02:00:00:00:00:00) is returned instead." enableSinceTargetSdk="30" id="170188668" name="RETURN_NULL_HARDWARE_ADDRESS">
+ <meta-data definedIn="java.net.NetworkInterface" sourcePosition="libcore/ojluni/src/main/java/java/net/NetworkInterface.java:79" />
+ </compat-change>
+ <compat-change description="Since Android 11, formatter classes, e.g. java.text.SimpleDateFormat, no longer provide English data when Locale.ROOT format is requested. Please use Locale.ENGLISH to format in English. Note that Locale.ROOT is used as language/country neutral locale or fallback locale, and does not guarantee to represent English locale. This flag is only for documentation and can't be overridden by app. Please use {@code targetSdkVersion} to enable the new behavior." enableAfterTargetSdk="29" id="159047832" name="USE_REAL_ROOT_LOCALE">
+ <meta-data definedIn="libcore.icu.LocaleData" sourcePosition="libcore/luni/src/main/java/libcore/icu/LocaleData.java:76" />
+ </compat-change>
+</config>
\ No newline at end of file
diff --git a/current/sdk/linux_glibc/x86/lib/libdexfile_static.a b/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
index 91bd40d..2ed9a8b 100644
--- a/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
+++ b/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a b/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
index f20dbef..f467f5e 100644
--- a/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
+++ b/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/sdk_library/public/service-art-stubs.jar b/current/sdk/sdk_library/public/service-art-stubs.jar
index b37b531..b62b671 100644
--- a/current/sdk/sdk_library/public/service-art-stubs.jar
+++ b/current/sdk/sdk_library/public/service-art-stubs.jar
Binary files differ
diff --git a/current/sdk/sdk_library/public/service-art.srcjar b/current/sdk/sdk_library/public/service-art.srcjar
index cbb9c6c..b62b671 100644
--- a/current/sdk/sdk_library/public/service-art.srcjar
+++ b/current/sdk/sdk_library/public/service-art.srcjar
Binary files differ
diff --git a/current/sdk/sdk_library/public/service-art.txt b/current/sdk/sdk_library/public/service-art.txt
index c7844e0..d802177 100644
--- a/current/sdk/sdk_library/public/service-art.txt
+++ b/current/sdk/sdk_library/public/service-art.txt
@@ -1,9 +1 @@
// Signature format: 2.0
-package com.android.server.art {
-
- public final class ArtManagerLocal {
- ctor public ArtManagerLocal();
- }
-
-}
-
diff --git a/current/sdk/snapshot-creation-build-number.txt b/current/sdk/snapshot-creation-build-number.txt
index e6f199a..bdc0d66 100644
--- a/current/sdk/snapshot-creation-build-number.txt
+++ b/current/sdk/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762355
\ No newline at end of file
+9106705
\ No newline at end of file
diff --git a/current/sdk/x86/lib/libnativebridge_lazy.so b/current/sdk/x86/lib/libnativebridge_lazy.so
index bd68eaa..e29ce34 100755
--- a/current/sdk/x86/lib/libnativebridge_lazy.so
+++ b/current/sdk/x86/lib/libnativebridge_lazy.so
Binary files differ
diff --git a/current/sdk/x86/lib/libnativehelper_compat_libc++.so b/current/sdk/x86/lib/libnativehelper_compat_libc++.so
index 9258788..786a396 100755
--- a/current/sdk/x86/lib/libnativehelper_compat_libc++.so
+++ b/current/sdk/x86/lib/libnativehelper_compat_libc++.so
Binary files differ
diff --git a/current/sdk/x86/lib/libnativeloader_lazy.so b/current/sdk/x86/lib/libnativeloader_lazy.so
index 0ba533e..a08661a 100755
--- a/current/sdk/x86/lib/libnativeloader_lazy.so
+++ b/current/sdk/x86/lib/libnativeloader_lazy.so
Binary files differ
diff --git a/current/sdk/x86_64/lib/libnativebridge_lazy.so b/current/sdk/x86_64/lib/libnativebridge_lazy.so
index 040dba5..2c05738 100755
--- a/current/sdk/x86_64/lib/libnativebridge_lazy.so
+++ b/current/sdk/x86_64/lib/libnativebridge_lazy.so
Binary files differ
diff --git a/current/sdk/x86_64/lib/libnativehelper_compat_libc++.so b/current/sdk/x86_64/lib/libnativehelper_compat_libc++.so
index c3fea83..5c19ac4 100755
--- a/current/sdk/x86_64/lib/libnativehelper_compat_libc++.so
+++ b/current/sdk/x86_64/lib/libnativehelper_compat_libc++.so
Binary files differ
diff --git a/current/sdk/x86_64/lib/libnativeloader_lazy.so b/current/sdk/x86_64/lib/libnativeloader_lazy.so
index e520d98..9e09d08 100755
--- a/current/sdk/x86_64/lib/libnativeloader_lazy.so
+++ b/current/sdk/x86_64/lib/libnativeloader_lazy.so
Binary files differ
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 9b2d0c4..869704d 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -1,15 +1,5 @@
// 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.
@@ -17,27 +7,11 @@
}
java_import {
- name: "art-module-test-exports_core-compat-test-rules@current",
- sdk_member_name: "core-compat-test-rules",
- visibility: [
- "//art/build/sdk",
- "//frameworks/base/tests/PlatformCompatGating/test-rules",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-compat-test-rules.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-compat-test-rules",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -51,34 +25,11 @@
}
java_import {
- name: "art-module-test-exports_core-test-rules@current",
- sdk_member_name: "core-test-rules",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/tests/util",
- "//external/conscrypt",
- "//external/conscrypt/apex/tests",
- "//frameworks/base/core/tests/coretests",
- "//frameworks/base/location/tests/locationtests",
- "//frameworks/base/wifi/tests",
- "//libcore",
- "//libcore/luni/src/test/java9compatibility",
- "//packages/modules/Wifi/framework/tests",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-test-rules.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-test-rules",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -99,36 +50,11 @@
}
java_import {
- name: "art-module-test-exports_core-tests-support@current",
- sdk_member_name: "core-tests-support",
- visibility: [
- "//art/build/sdk",
- "//cts/apps/CtsVerifier",
- "//cts/tests/tests/keystore",
- "//cts/tests/tests/net",
- "//cts/tests/tests/net/api23Test",
- "//external/apache-harmony",
- "//frameworks/base/core/tests/coretests",
- "//libcore",
- "//libcore/benchmarks",
- "//packages/apps/KeyChain/tests",
- "//packages/modules/Connectivity/tests:__subpackages__",
- "//prebuilts:__subpackages__",
- "//system/timezone/distro/core",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-tests-support.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-tests-support",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -151,27 +77,11 @@
}
java_import {
- name: "art-module-test-exports_okhttp-tests-nojarjar@current",
- sdk_member_name: "okhttp-tests-nojarjar",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/okhttp",
- "//external/okhttp",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_external_okhttp_license@current"],
- jars: ["java/okhttp-tests-nojarjar.jar"],
-}
-
-art_prebuilt_java_import {
name: "okhttp-tests-nojarjar",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -185,26 +95,11 @@
}
java_import {
- name: "art-module-test-exports_art_cts_jvmti_test_library@current",
- sdk_member_name: "art_cts_jvmti_test_library",
- visibility: [
- "//art:__subpackages__",
- "//cts/hostsidetests/jvmti:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_art_license@current"],
- jars: ["java/art_cts_jvmti_test_library.jar"],
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art:__subpackages__",
@@ -217,27 +112,11 @@
}
java_import {
- name: "art-module-test-exports_expected_cts_outputs@current",
- sdk_member_name: "expected_cts_outputs",
- visibility: [
- "//art/build/sdk",
- "//art/test",
- "//cts/hostsidetests/jvmti:__subpackages__",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_art_license@current"],
- jars: ["java/expected_cts_outputs.jar"],
-}
-
-art_prebuilt_java_import {
name: "expected_cts_outputs",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -251,28 +130,11 @@
}
java_import {
- name: "art-module-test-exports_core-libart-for-host@current",
- sdk_member_name: "core-libart-for-host",
- visibility: [
- "//art/build/sdk",
- "//external/robolectric-shadows",
- "//frameworks/layoutlib",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-libart-for-host.jar"],
-}
-
-art_prebuilt_java_import {
name: "core-libart-for-host",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -287,27 +149,11 @@
}
java_import {
- name: "art-module-test-exports_okhttp-for-host@current",
- sdk_member_name: "okhttp-for-host",
- visibility: [
- "//art/build/sdk",
- "//external/okhttp",
- "//external/robolectric-shadows",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_external_okhttp_license@current"],
- jars: ["java/okhttp-for-host.jar"],
-}
-
-art_prebuilt_java_import {
name: "okhttp-for-host",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -321,27 +167,11 @@
}
java_import {
- name: "art-module-test-exports_libcore-expectations-knownfailures-jar@current",
- sdk_member_name: "libcore-expectations-knownfailures-jar",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore:__subpackages__",
- "//libcore/expectations",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/libcore-expectations-knownfailures-jar.jar"],
-}
-
-art_prebuilt_java_import {
name: "libcore-expectations-knownfailures-jar",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -355,27 +185,11 @@
}
java_import {
- name: "art-module-test-exports_libcore-expectations-virtualdeviceknownfailures-jar@current",
- sdk_member_name: "libcore-expectations-virtualdeviceknownfailures-jar",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore:__subpackages__",
- "//libcore/expectations",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/libcore-expectations-virtualdeviceknownfailures-jar.jar"],
-}
-
-art_prebuilt_java_import {
name: "libcore-expectations-virtualdeviceknownfailures-jar",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -389,27 +203,11 @@
}
java_import {
- name: "art-module-test-exports_okhttp-nojarjar@current",
- sdk_member_name: "okhttp-nojarjar",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/okhttp",
- "//external/okhttp",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_external_okhttp_license@current"],
- jars: ["java/okhttp-nojarjar.jar"],
-}
-
-art_prebuilt_java_import {
name: "okhttp-nojarjar",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -423,28 +221,11 @@
}
java_test_import {
- name: "art-module-test-exports_apache-harmony-jdwp-tests@current",
- sdk_member_name: "apache-harmony-jdwp-tests",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/jdwp",
- "//external/apache-harmony/jdwp",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_external_apache-harmony_jdwp_license@current"],
- jars: ["java/apache-harmony-jdwp-tests.jar"],
- test_config: "java/apache-harmony-jdwp-tests-AndroidTest.xml",
-}
-
-art_prebuilt_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.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -459,28 +240,11 @@
}
java_test_import {
- name: "art-module-test-exports_libcore-crypto-tests@current",
- sdk_member_name: "libcore-crypto-tests",
- visibility: [
- "//art/build/sdk",
- "//external/conscrypt/apex/tests",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/libcore-crypto-tests.jar"],
- test_config: "java/libcore-crypto-tests-AndroidTest.xml",
-}
-
-art_prebuilt_java_test_import {
name: "libcore-crypto-tests",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -495,28 +259,11 @@
}
java_test_import {
- name: "art-module-test-exports_core-ojtests-public@current",
- sdk_member_name: "core-ojtests-public",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/ojluni",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-ojtests-public.jar"],
- test_config: "java/core-ojtests-public-AndroidTest.xml",
-}
-
-art_prebuilt_java_test_import {
name: "core-ojtests-public",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -531,28 +278,11 @@
}
java_test_import {
- name: "art-module-test-exports_jsr166-tests@current",
- sdk_member_name: "jsr166-tests",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/jsr166",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/jsr166-tests.jar"],
- test_config: "java/jsr166-tests-AndroidTest.xml",
-}
-
-art_prebuilt_java_test_import {
name: "jsr166-tests",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -567,28 +297,11 @@
}
java_test_import {
- name: "art-module-test-exports_apache-harmony-tests@current",
- sdk_member_name: "apache-harmony-tests",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/luni",
- "//external/apache-harmony",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_external_apache-harmony_license@current"],
- jars: ["java/apache-harmony-tests.jar"],
- test_config: "java/apache-harmony-tests-AndroidTest.xml",
-}
-
-art_prebuilt_java_test_import {
name: "apache-harmony-tests",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -603,28 +316,11 @@
}
java_test_import {
- name: "art-module-test-exports_core-tests@current",
- sdk_member_name: "core-tests",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/luni",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- jars: ["java/core-tests.jar"],
- test_config: "java/core-tests-AndroidTest.xml",
-}
-
-art_prebuilt_java_test_import {
name: "core-tests",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -639,17 +335,6 @@
}
license {
- name: "art-module-test-exports_art_license@current",
- sdk_member_name: "art_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- ],
- license_text: ["licenses/art/NOTICE"],
-}
-
-license {
name: "art-module-test-exports_art_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -660,28 +345,6 @@
}
license {
- name: "art-module-test-exports_libcore_license@current",
- sdk_member_name: "libcore_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OpenSSL",
- "SPDX-license-identifier-Unicode-DFS",
- "SPDX-license-identifier-W3C",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/libcore/LICENSE",
- "licenses/libcore/NOTICE",
- ],
-}
-
-license {
name: "art-module-test-exports_libcore_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -703,14 +366,6 @@
}
license {
- name: "art-module-test-exports_external_okhttp_license@current",
- sdk_member_name: "external_okhttp_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/external/okhttp/LICENSE.txt"],
-}
-
-license {
name: "art-module-test-exports_external_okhttp_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -718,18 +373,6 @@
}
license {
- name: "art-module-test-exports_external_apache-harmony_jdwp_license@current",
- sdk_member_name: "external_apache-harmony_jdwp_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: [
- "licenses/external/apache-harmony/jdwp/COPYRIGHT.txt",
- "licenses/external/apache-harmony/jdwp/LICENSE.txt",
- "licenses/external/apache-harmony/jdwp/NOTICE.txt",
- ],
-}
-
-license {
name: "art-module-test-exports_external_apache-harmony_jdwp_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -741,14 +384,6 @@
}
license {
- name: "art-module-test-exports_external_apache-harmony_license@current",
- sdk_member_name: "external_apache-harmony_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/external/apache-harmony/NOTICE"],
-}
-
-license {
name: "art-module-test-exports_external_apache-harmony_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -756,46 +391,11 @@
}
cc_prebuilt_library_shared {
- name: "art-module-test-exports_libjavacoretests@current",
- sdk_member_name: "libjavacoretests",
- visibility: [
- "//art/build/sdk",
- "//cts/tests/libcore/luni",
- "//libcore",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["art-module-test-exports_libcore_license@current"],
- installable: false,
- compile_multilib: "both",
- shared_libs: [
- "liblog",
- "libnativehelper",
- ],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libjavacoretests.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libjavacoretests.so"],
- },
- arm: {
- srcs: ["arm/lib/libjavacoretests.so"],
- },
- x86: {
- srcs: ["x86/lib/libjavacoretests.so"],
- },
- },
-}
-
-art_prebuilt_cc_prebuilt_library_shared {
name: "libjavacoretests",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "art_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "art_module",
+ var_name: "source_build",
},
visibility: [
"//art/build/sdk",
@@ -825,30 +425,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "art-module-test-exports@current",
- visibility: ["//art:__subpackages__"],
- java_libs: [
- "art-module-test-exports_core-compat-test-rules@current",
- "art-module-test-exports_core-test-rules@current",
- "art-module-test-exports_core-tests-support@current",
- "art-module-test-exports_okhttp-tests-nojarjar@current",
- "art-module-test-exports_art_cts_jvmti_test_library@current",
- "art-module-test-exports_expected_cts_outputs@current",
- "art-module-test-exports_core-libart-for-host@current",
- "art-module-test-exports_okhttp-for-host@current",
- "art-module-test-exports_libcore-expectations-knownfailures-jar@current",
- "art-module-test-exports_libcore-expectations-virtualdeviceknownfailures-jar@current",
- "art-module-test-exports_okhttp-nojarjar@current",
- ],
- java_tests: [
- "art-module-test-exports_apache-harmony-jdwp-tests@current",
- "art-module-test-exports_libcore-crypto-tests@current",
- "art-module-test-exports_core-ojtests-public@current",
- "art-module-test-exports_jsr166-tests@current",
- "art-module-test-exports_apache-harmony-tests@current",
- "art-module-test-exports_core-tests@current",
- ],
- native_shared_libs: ["art-module-test-exports_libjavacoretests@current"],
-}
diff --git a/current/test-exports/arm/lib/libjavacoretests.so b/current/test-exports/arm/lib/libjavacoretests.so
index 6deddb9..21646ef 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 5d0b84f..2cb38d6 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-libart-for-host.jar b/current/test-exports/java/core-libart-for-host.jar
index 2c0049b..95c9fc1 100644
--- a/current/test-exports/java/core-libart-for-host.jar
+++ b/current/test-exports/java/core-libart-for-host.jar
Binary files differ
diff --git a/current/test-exports/java/core-tests.jar b/current/test-exports/java/core-tests.jar
index a967bea..0e1d1de 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 e6f199a..bdc0d66 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762355
\ No newline at end of file
+9106705
\ No newline at end of file
diff --git a/current/test-exports/x86/lib/libjavacoretests.so b/current/test-exports/x86/lib/libjavacoretests.so
index 43e9296..7da29b8 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 3d897af..2657e59 100755
--- a/current/test-exports/x86_64/lib/libjavacoretests.so
+++ b/current/test-exports/x86_64/lib/libjavacoretests.so
Binary files differ