diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-08-26 00:20:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-26 00:20:52 +0000 |
| commit | 67793ab02a2625c34539404b44d9b7098a076cfd (patch) | |
| tree | b947ea0135ff9af769c66ab8ab7bc57ee04d1a0c | |
| parent | 72a1ff03a1b73eb192a55d1709dc60ecfb23b461 (diff) | |
| parent | fd46044fef3b7e3f740d8ad077e2bc8a83783c23 (diff) | |
| download | valgrind-67793ab02a2625c34539404b44d9b7098a076cfd.tar.gz | |
Merge "Use correct LOCAL_MODULE_TARGET_ARCH for x86_64" am: 170e6a100b
am: fd46044fef
Change-Id: I004260c20888a8ea58ea763c409a3ebdfa4655b8
| -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 := |