Fix dependencies on x86_64 valgrind
x86_64 valgrind is called amd64, not x86_64.
Test: lunch aosp_x86_64-eng && m checkbuild
Change-Id: Ie529b9ca6cd12463d5604885c719438477a8c8a1
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 8ba48be..641d7b1 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -382,12 +382,14 @@
# Valgrind is not supported for x86
ifneq (,$(filter $(ART_VALGRIND_SUPPORTED_ARCH),$(TARGET_ARCH)))
+art_vg_arch := $(if $(filter x86_64,$(TARGET_ARCH)),amd64,$(TARGET_ARCH))
ART_VALGRIND_TARGET_DEPENDENCIES += \
$(TARGET_OUT_EXECUTABLES)/valgrind \
- $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/memcheck-$(TARGET_ARCH)-linux \
- $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/vgpreload_core-$(TARGET_ARCH)-linux.so \
- $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/vgpreload_memcheck-$(TARGET_ARCH)-linux.so \
+ $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/memcheck-$(art_vg_arch)-linux \
+ $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/vgpreload_core-$(art_vg_arch)-linux.so \
+ $(TARGET_OUT_SHARED_LIBRARIES)/valgrind/vgpreload_memcheck-$(art_vg_arch)-linux.so \
$(TARGET_OUT_SHARED_LIBRARIES)/valgrind/default.supp
+art_vg_arch :=
endif
ifdef TARGET_2ND_ARCH