diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index 172c96cfde..3edd91380f 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -261,15 +261,18 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime ifeq ($$(art_target_or_host),host) - LOCAL_LDLIBS += -ldl -lpthread + # For compiler driver TLS. + LOCAL_LDLIBS += -lpthread endif LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + # Vixl assembly support for ARM64 targets. + LOCAL_SHARED_LIBRARIES += libvixl ifeq ($$(art_target_or_host),target) - LOCAL_SHARED_LIBRARIES += libcutils libvixl + # For atrace. + LOCAL_SHARED_LIBRARIES += libcutils include $(BUILD_SHARED_LIBRARY) else # host - LOCAL_STATIC_LIBRARIES += libcutils libvixl LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) endif |