diff options
| author | Ying Wang <wangying@google.com> | 2016-03-16 19:45:49 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2016-03-25 13:26:14 -0700 |
| commit | 4bf606d101eb582c17b94355a44f21db87a54806 (patch) | |
| tree | 7a706edb8d07e848791fb928d2153af0facad56b | |
| parent | 8fc763c34f7c906215e26fd4a0137da57cc144f0 (diff) | |
| download | valgrind-4bf606d101eb582c17b94355a44f21db87a54806.tar.gz | |
Explicitly set LOCAL_MODULE_TARGET_ARCH
This avoids conflict when we have x86+arm multilib build.
Bug: 27526885
Change-Id: I7d5daf83faafa81311aec0e791646552b5e06175
(cherry-pick from commit 2a5dae0be5ad61e2e73f3605f5df7c7d0016558e)
| -rw-r--r-- | Android.build_one.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.build_one.mk b/Android.build_one.mk index b801e0666..cb5de0748 100644 --- a/Android.build_one.mk +++ b/Android.build_one.mk @@ -32,6 +32,8 @@ endif LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux +LOCAL_MODULE_TARGET_ARCH := $(vg_local_arch) + LOCAL_SRC_FILES := $(vg_local_src_files) LOCAL_C_INCLUDES := $(common_includes) $(vg_local_c_includes) @@ -74,4 +76,3 @@ ifeq ($(vg_local_no_crt),true) endif include $(BUILD_$(vg_local_target)) - |