Remove prebuilt com.android.art APEXes for the time being.
We are not currently targeting building platform with ART prebuilts in
AOSP.
This avoids ambiguity when deciding which prebuilt APEX to use for
deapexing in platform builds where there are other prebuilts than
these. A proper solution for that requires introducing a product
variable to specify which APEXes to use, which requires more
engineering effort (b/192006406).
Test: m droid SOONG_CONFIG_art_module_source_build=false
on internal master
Test: art/build/build-art-module.sh
on master-art
Test: art/tools/buildbot-build.sh --target
on master-art
Bug: 192006406
Bug: 202192894
Change-Id: I342b9f400e9778675e21103428d65feb5d4640f3
diff --git a/Android.bp b/Android.bp
index 9be2d10..7dbf6b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,52 +1,3 @@
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
-
-prebuilt_apex {
- name: "com.android.art.debug",
- arch: {
- arm: {
- src: "com.android.art.debug-arm.apex",
- },
- arm64: {
- src: "com.android.art.debug-arm64.apex",
- },
- x86: {
- src: "com.android.art.debug-x86.apex",
- },
- x86_64: {
- src: "com.android.art.debug-x86_64.apex",
- },
- },
-}
-
-prebuilt_apex {
- name: "com.android.art",
-
- // TODO(b/192006406): There is currently no good way to control which
- // prebuilt APEX (com.google.android.art or com.android.art) gets picked for
- // deapexing to provide dex jars for hiddenapi and dexpreopting. Instead the
- // AOSP APEX is completely disabled, and we build from source for AOSP
- // products.
- enabled: false,
-
- arch: {
- arm: {
- src: "com.android.art-arm.apex",
- },
- arm64: {
- src: "com.android.art-arm64.apex",
- },
- x86: {
- src: "com.android.art-x86.apex",
- },
- x86_64: {
- src: "com.android.art-x86_64.apex",
- },
- },
-
- // Make fragment related files from the apex file available for use by the
- // build when using prebuilts, e.g. for running the boot jars package check
- // and hidden API flag validation among other uses.
- exported_bootclasspath_fragments: ["art-bootclasspath-fragment"],
-}
diff --git a/com.android.art-arm.apex b/com.android.art-arm.apex
deleted file mode 100644
index 939cb1a..0000000
--- a/com.android.art-arm.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art-arm64.apex b/com.android.art-arm64.apex
deleted file mode 100644
index d1fe117..0000000
--- a/com.android.art-arm64.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art-x86.apex b/com.android.art-x86.apex
deleted file mode 100644
index 438df35..0000000
--- a/com.android.art-x86.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art-x86_64.apex b/com.android.art-x86_64.apex
deleted file mode 100644
index 645be70..0000000
--- a/com.android.art-x86_64.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art.debug-arm.apex b/com.android.art.debug-arm.apex
deleted file mode 100644
index f240c0a..0000000
--- a/com.android.art.debug-arm.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art.debug-arm64.apex b/com.android.art.debug-arm64.apex
deleted file mode 100644
index 573deac..0000000
--- a/com.android.art.debug-arm64.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art.debug-x86.apex b/com.android.art.debug-x86.apex
deleted file mode 100644
index ecd6954..0000000
--- a/com.android.art.debug-x86.apex
+++ /dev/null
Binary files differ
diff --git a/com.android.art.debug-x86_64.apex b/com.android.art.debug-x86_64.apex
deleted file mode 100644
index 6a1d4f3..0000000
--- a/com.android.art.debug-x86_64.apex
+++ /dev/null
Binary files differ
