commit 1bc4c5d429063290ff750a53e402f8e7a4379edf
author Colin Cross <ccross@android.com> Wed Feb 14 06:13:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 14 06:13:46 2018 +0000
tree b0bdfc870ebbb5c31b23993bad9c7ed911e72b8d
parent 5f08f9b885de4ec95f249165d832a4b88866bb7c
parent 2bfdd46c36e3a3603d1a1dbc01f820da07091492

Merge "Fix building host valgrind for TARGET_ARCH=x86"
am: 2bfdd46c36

Change-Id: I7f71ca59fd1c7d74c8d293f53620eb9966a2e3f2

Android.build_one.mk

diff --git a/Android.build_one.mk b/Android.build_one.mk
index 62d2c47..126ad1c 100644
--- a/Android.build_one.mk
+++ b/Android.build_one.mk
@@ -14,6 +14,8 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_MODULE_TARGET_ARCH := $(VALGRIND_SUPPORTED_ARCH)
+
 LOCAL_ARM_MODE := arm
 ifeq ($(vg_build_second_arch),true)
 LOCAL_MULTILIB := 32

Android.mk

diff --git a/Android.mk b/Android.mk
index 8c3f8a2..19f38ef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,8 @@
 
 ANDROID_HARDWARE := ANDROID_HARDWARE_generic
 
-ifneq ($(filter arm arm64 x86_64,$(TARGET_ARCH)),)
+# When updating this list also update the list in art/build/Android.gtest.mk
+VALGRIND_SUPPORTED_ARCH := arm arm64 x86_64
 
 vg_arch:=$(TARGET_ARCH)
 
@@ -654,5 +655,3 @@
 
 include $(BUILD_PREBUILT)
 endif
-
-endif