Merge "Update apex rules for dex2oatd"
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index d53a7f2..9b5c638 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -29,10 +29,16 @@
]
// - Debug variants (binaries for which a 32-bit version is preferred).
art_runtime_debug_binaries_prefer32 = [
- "dex2oatd",
"dexoptanalyzerd",
"profmand",
]
+art_runtime_debug_binaries_prefer32_device = [
+ "dex2oatd",
+]
+art_runtime_debug_binaries_both_host = [
+ "dex2oatd",
+]
+
// - Debug variants (libraries).
art_runtime_debug_native_shared_libs = [
"libartd",
@@ -165,7 +171,8 @@
},
prefer32: {
binaries: art_runtime_base_binaries_prefer32
- + art_runtime_debug_binaries_prefer32,
+ + art_runtime_debug_binaries_prefer32
+ + art_runtime_debug_binaries_prefer32_device,
},
first: {
binaries: art_tools_device_binaries,
@@ -196,7 +203,8 @@
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,
+ binaries: art_runtime_base_binaries_both
+ + art_runtime_debug_binaries_both_host,
},
first: {
binaries: art_tools_host_binaries
diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index 84c0f4f..155709a 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -129,6 +129,9 @@
function check_multilib_binary {
# TODO: Use $TARGET_ARCH (e.g. check whether it is "arm" or "arm64") to improve
# the precision of this test?
+ if ! [[ -L "$mount_point/bin/${1}" ]]; then
+ fail_check "Cannot find symlink for multilib binary '$1' in mounted image"
+ fi
[[ -x "$mount_point/bin/${1}32" ]] || [[ -x "$mount_point/bin/${1}64" ]] \
|| fail_check "Cannot find binary '$1' in mounted image"
}