Add art-bootclasspath-fragment
Adds bootclasspath_fragment for the art module alongside the existing
boot_image which will be removed in a follow up change once prebuilts
have been updated.
Bug: 177892522
Test: art/build/build-art-module.sh
packages/modules/ArtPrebuilt/update-art-module-prebuilts.py \
--local-dist=out/dist --skip-cls
m droid
Change-Id: I37c4e4b2164b65d7e41cf27ddf13cfa0632c59a7
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 2951673..5897585 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -246,6 +246,7 @@
compile_multilib: "both",
manifest: "manifest-art.json",
boot_images: ["art-boot-image"],
+ bootclasspath_fragments: ["art-bootclasspath-fragment"],
compat_configs: ["libcore-platform-compat-config"],
java_libs: libcore_java_libs + art_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs +
diff --git a/build/boot/Android.bp b/build/boot/Android.bp
index 25e4ff8..52826a9 100644
--- a/build/boot/Android.bp
+++ b/build/boot/Android.bp
@@ -33,3 +33,16 @@
"com.android.art.debug",
],
}
+
+bootclasspath_fragment {
+ name: "art-bootclasspath-fragment",
+ image_name: "art",
+ visibility: [
+ "//art/build/apex",
+ "//art/build/sdk",
+ ],
+ apex_available: [
+ "com.android.art",
+ "com.android.art.debug",
+ ],
+}
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 2bc60a0..b0cc2bf 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -86,6 +86,9 @@
boot_images: [
"art-boot-image",
],
+ bootclasspath_fragments: [
+ "art-bootclasspath-fragment",
+ ],
compat_configs: [
"libcore-platform-compat-config",