From 86d1dc764a6ea0eef82cd37a4246c234d923c81b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 13 Feb 2018 13:47:45 -0800
Subject: Fix building host valgrind for TARGET_ARCH=x86

The entire valgrind build was disabled when TARGET_ARCH=x86.  It
should still build the host valgrind tool even if the target arch
is not supported.  Use LOCAL_MODULE_TARGET_ARCH instead of a
conditional.

Test: lunch aosp_x86-eng && m checkbuild
Change-Id: I89de9f9675d30ea3a760339798ed41bc3eaa72c3
---
 Android.build_one.mk | 2 ++
 Android.mk           | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Android.build_one.mk b/Android.build_one.mk
index 62d2c4702..126ad1c8d 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
diff --git a/Android.mk b/Android.mk
index 8c3f8a226..19f38ef85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,8 @@ LOCAL_PATH:= $(call my-dir)
 
 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 @@ LOCAL_SRC_FILES := bionic.supp
 
 include $(BUILD_PREBUILT)
 endif
-
-endif
-- 
cgit v1.2.3