diff options
| -rw-r--r-- | build/apex/Android.bp | 14 | ||||
| -rwxr-xr-x | build/apex/runtests.sh | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 9bf65512b3..d35ceaedb2 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -30,10 +30,16 @@ bionic_binaries_both = [ ] // - 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", @@ -162,7 +168,8 @@ apex { }, 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, @@ -193,7 +200,8 @@ art_apex { 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 83c42bcf9a..4c3eb0a127 100755 --- a/build/apex/runtests.sh +++ b/build/apex/runtests.sh @@ -129,6 +129,9 @@ function check_binary { 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" } |