Revert "Introduce support for hardware simulators, starting with ARM64"
This reverts commit c2e1a5edc438274159c6ef8e65455ac73723a8f1.
This breaks the build for x86_64 targets. This is because on target the libvixl is not included as a
library for the libart.so target build. The build of non-x86_64 targets only works because the
compilers removes the dead-code that contains the libvixl symbols.
Bug: 23321940
Change-Id: I39e93ff05b887665c47fb0986867f1d13ca65b9b
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 254c08c..8f70d30 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -196,8 +196,6 @@
arch/x86/instruction_set_features_x86.cc \
arch/x86/registers_x86.cc \
arch/x86_64/registers_x86_64.cc \
- simulator/code_simulator.cc \
- simulator/code_simulator_arm64.cc \
entrypoints/entrypoint_utils.cc \
entrypoints/interpreter/interpreter_entrypoints.cc \
entrypoints/jni/jni_entrypoints.cc \
@@ -496,11 +494,11 @@
LOCAL_SHARED_LIBRARIES += libcutils
else # host
ifeq ($$(art_static_or_shared),static)
- LOCAL_STATIC_LIBRARIES += libziparchive-host libz libvixl
+ LOCAL_STATIC_LIBRARIES += libziparchive-host libz
# For ashmem_create_region.
LOCAL_STATIC_LIBRARIES += libcutils
else
- LOCAL_SHARED_LIBRARIES += libziparchive-host libz-host libvixl
+ LOCAL_SHARED_LIBRARIES += libziparchive-host libz-host
# For ashmem_create_region.
LOCAL_SHARED_LIBRARIES += libcutils
endif