commit 5705890b703ae63479a8efc69d48151d40c99d21
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 15 08:26:14 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 15 08:26:14 2018 +0000
tree b0bdfc870ebbb5c31b23993bad9c7ed911e72b8d
parent bfd947ec30bc7271d329da0ead625078843cf1fa
parent 931fa63c326c81d3b742dcc6a32d6127f28803c0

Snap for 4605948 from 931fa63c326c81d3b742dcc6a32d6127f28803c0 to pi-release

Change-Id: I46c673554ff131306b1074b9c6fc72a5541db9dc

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