From 4bf606d101eb582c17b94355a44f21db87a54806 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 16 Mar 2016 19:45:49 -0700 Subject: 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) --- Android.build_one.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Android.build_one.mk') 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)) - -- cgit v1.2.3