Revert "Add apex com.android.runtime.host artifact"
This reverts commit 36703dc24125b52b62c05e934a050f2a298cc617.
Bug: 120436895
Reason for revert: Breaks x86 only build.
Change-Id: Ifd5b561eeffcd721174f5eb591c6bad66dff8de8
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index ab8e12b..159e5c1 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -49,13 +49,10 @@
]
// Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
-art_tools_common_binaries = [
+art_tools_binaries = [
"dexdiag",
"dexdump",
"dexlist",
-]
-
-art_tools_device_binaries = [
"oatdump",
]
@@ -69,8 +66,6 @@
// ...
]
-art_tools_binaries = art_tools_common_binaries + art_tools_device_binaries
-
apex_key {
name: "com.android.runtime.key",
public_key: "com.android.runtime.avbpubkey",
@@ -135,32 +130,3 @@
// TODO: Also package a `ld.config.txt` config file (to be placed in `etc/`).
// ...
}
-
-apex {
- name: "com.android.runtime.host",
- compile_multilib: "both",
- payload_type: "zip",
- // TODO: We need this and the multilib is different from above b/c ART sets
- // different prefer32 on host and device. We should change this.
- host_supported: true,
- device_supported: false,
- // The files are the same on both.
- manifest: "manifest.json",
- native_shared_libs: art_runtime_base_native_shared_libs
- + art_runtime_fake_native_shared_libs
- + art_runtime_debug_native_shared_libs,
- multilib: {
- both: {
- // TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
- // (see `symlink_preferred_arch` in art/dalvikvm/Android.bp).
- binaries: art_runtime_base_binaries_both,
- },
- first: {
- // TODO: oatdump cannot link with host linux_bionic due to not using clang ld
- binaries: art_tools_common_binaries
- + art_runtime_base_binaries_prefer32
- + art_runtime_debug_binaries_prefer32,
- }
- },
- key: "com.android.runtime.key",
-}