diff options
| -rw-r--r-- | build/Android.gtest.mk | 4 | ||||
| -rw-r--r-- | runtime/Android.bp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 95d0f38b67..1b2180e508 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -261,6 +261,10 @@ ART_GTEST_two_runtimes_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TAR ART_GTEST_transaction_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32) ART_GTEST_transaction_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TARGET_CORE_IMAGE_DEFAULT_32) +# The dex2oat_vdex_test test has dependencies on core.oat. +ART_GTEST_dex2oat_vdex_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32) +ART_GTEST_dex2oat_vdex_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TARGET_CORE_IMAGE_DEFAULT_32) + ART_GTEST_dex2oat_environment_tests_HOST_DEPS := \ $(HOST_CORE_IMAGE_optimizing_64) \ $(HOST_CORE_IMAGE_optimizing_32) \ diff --git a/runtime/Android.bp b/runtime/Android.bp index 7e750160fb..ec59d44eda 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -19,8 +19,8 @@ // new jit code is generated. We don't want it to be called when a different function with the same // (empty) body is called. JIT_DEBUG_REGISTER_CODE_LDFLAGS = [ - "-Wl,--keep-unique,__jit_debug_register_code", - "-Wl,--keep-unique,__dex_debug_register_code", + // "-Wl,--keep-unique,__jit_debug_register_code", + // "-Wl,--keep-unique,__dex_debug_register_code" ] // These are defaults for native shared libaries that are expected to be |