diff options
| author | Colin Cross <ccross@android.com> | 2018-02-14 06:18:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-14 06:18:27 +0000 |
| commit | e8e27d437641fc915e8475ee6c0783073925d76f (patch) | |
| tree | b0bdfc870ebbb5c31b23993bad9c7ed911e72b8d | |
| parent | 6b09282fe765eef2a2bb35c37769f3b753f783df (diff) | |
| parent | 1bc4c5d429063290ff750a53e402f8e7a4379edf (diff) | |
| download | valgrind-e8e27d437641fc915e8475ee6c0783073925d76f.tar.gz | |
Merge "Fix building host valgrind for TARGET_ARCH=x86" am: 2bfdd46c36
am: 1bc4c5d429
Change-Id: Ie4703126fb9327804b55876e4660e63279f7bc85
| -rw-r--r-- | Android.build_one.mk | 2 | ||||
| -rw-r--r-- | 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 |