diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-03-18 15:04:55 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-03-19 15:01:08 -0700 |
| commit | e0d1a4bab479131868384b769171466354390480 (patch) | |
| tree | c7bf98c80bcd250aee788fbfe2550b3cca053e8c /main | |
| parent | dc27d36d2120edd2a7ead4c7b5fc562f5d43b324 (diff) | |
| download | valgrind-e0d1a4bab479131868384b769171466354390480.tar.gz | |
Fix path to tools for arm64 build
Change-Id: Ie8acba09d7817764e0ad0b6e9f9aa6675fd53082
Diffstat (limited to 'main')
| -rw-r--r-- | main/Android.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/main/Android.mk b/main/Android.mk index 5bb996299..2f70a612b 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -23,7 +23,6 @@ common_cflags := \ -Wno-pointer-sign -Wno-sign-compare -Wno-unused-parameter -Wno-shadow \ -fno-strict-aliasing -fno-stack-protector \ -DVGO_linux=1 \ - -DVG_LIBDIR=\"/system/lib/valgrind\" \ -DANDROID_SYMBOLS_DIR=\"/data/local/symbols\" target_arch_cflags := \ @@ -32,11 +31,21 @@ target_arch_cflags := \ -DVGPV_$(TARGET_ARCH)_linux_android=1 \ -DVG_PLATFORM=\"$(TARGET_ARCH)-linux\" +ifeq ($(TARGET_IS_64_BIT),true) +target_arch_cflags += \ + -DVG_LIBDIR=\"/system/lib64/valgrind\" +else +target_arch_cflags += \ + -DVG_LIBDIR=\"/system/lib/valgrind\" + +endif + ifdef TARGET_2ND_ARCH target_2nd_arch_cflags := \ -DVGA_$(TARGET_2ND_ARCH)=1 \ -DVGP_$(TARGET_2ND_ARCH)_linux=1 \ -DVGPV_$(TARGET_2ND_ARCH)_linux_android=1 \ + -DVG_LIBDIR=\"/system/lib/valgrind\" \ -DVG_PLATFORM=\"$(TARGET_2ND_ARCH)-linux\" endif @@ -296,9 +305,6 @@ LOCAL_ASFLAGS := $(common_cflags) LOCAL_ASFLAGS_$(TARGET_ARCH) = $(target_arch_cflags) LOCAL_ASFLAGS_$(TARGET_2ND_ARCH) = $(target_2nd_arch_cflags) -$(info LOCAL_CFLAGS_$(TARGET_ARCH) = $(target_arch_cflags) ) -$(info LOCAL_CFLAGS_$(TARGET_2ND_ARCH) = $(target_2nd_arch_cflags) ) - include $(BUILD_STATIC_LIBRARY) # Build libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux.a |