diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-08-26 01:39:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-26 01:39:19 +0000 |
| commit | be245b4e2e71865f549a55c88055bf75cde38061 (patch) | |
| tree | b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c | |
| parent | 825b2fd4b69e4047f07a58a12c60f2ca1b76f479 (diff) | |
| parent | 2a8a3b47a434974eb622355ccc6dd6f0a2e280dd (diff) | |
| download | valgrind-be245b4e2e71865f549a55c88055bf75cde38061.tar.gz | |
Merge "Use correct LOCAL_MODULE_TARGET_ARCH for x86_64" am: 170e6a100b am: fd46044fef am: 67793ab02a
am: 2a8a3b47a4
Change-Id: Ie11829e546c5e3e6a10b5ecedb3dfca1d1e85745
| -rw-r--r-- | Android.build_one.mk | 4 | ||||
| -rw-r--r-- | Android.clean.mk | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Android.build_one.mk b/Android.build_one.mk index cb5de0748..9ab3a2b60 100644 --- a/Android.build_one.mk +++ b/Android.build_one.mk @@ -18,9 +18,11 @@ LOCAL_ARM_MODE := arm ifeq ($(vg_build_second_arch),true) LOCAL_MULTILIB := 32 vg_local_arch := $(TARGET_2ND_ARCH) +vg_local_android_arch := $(TARGET_2ND_ARCH) else LOCAL_MULTILIB := first vg_local_arch := $(vg_arch) +vg_local_android_arch := $(TARGET_ARCH) endif # TODO: This workaround is to avoid calling memset from VG(memset) @@ -32,7 +34,7 @@ endif LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux -LOCAL_MODULE_TARGET_ARCH := $(vg_local_arch) +LOCAL_MODULE_TARGET_ARCH := $(vg_local_android_arch) LOCAL_SRC_FILES := $(vg_local_src_files) diff --git a/Android.clean.mk b/Android.clean.mk index 31ae7f46e..ed0a053ce 100644 --- a/Android.clean.mk +++ b/Android.clean.mk @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. - +vg_local_android_arch := +vg_local_arch := vg_local_module := vg_local_target := vg_local_module_class := |