diff options
author | Vasily Tarasov <vtarasov@google.com> | 2018-03-03 00:40:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-03 00:40:15 +0000 |
commit | 7d3f5da415f0f6ae3d79565ec5422019e4b32d9c (patch) | |
tree | 3ac9eb94a77d88b8b669e2b2f1074ea20a6d9ab4 | |
parent | 931fa63c326c81d3b742dcc6a32d6127f28803c0 (diff) | |
parent | 536792a9edfa3ef7bdf1f75decaa4ad5d5f0409b (diff) | |
download | valgrind-pie-b4s4-release.tar.gz |
Merge "Build vgdb and lackey tools" am: 4d49239373 am: 58ec2b6685android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 536792a9ed
Change-Id: Ie3f60c835125dacb61c0c1f0bd5c4bd8345e0ff9
-rw-r--r-- | Android.mk | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 19f38ef85..a1c632473 100644 --- a/Android.mk +++ b/Android.mk @@ -568,6 +568,27 @@ vg_local_whole_static_libraries := libreplacemalloc_toolpreload include $(LOCAL_PATH)/Android.build_all.mk +# Build lackey-$(TARGET_ARCH)-linux +vg_local_module := lackey +vg_local_module_class := SHARED_LIBRARIES +vg_local_target := EXECUTABLE +vg_local_no_crt := true +vg_local_without_system_shared_libraries := true +vg_local_src_files := lackey/lk_main.c +vg_local_ldflags := $(tool_ldflags) +vg_local_cflags := $(common_cflags) +vg_local_static_libraries := libcoregrind libvex +include $(LOCAL_PATH)/Android.build_all.mk + +# Build vgpreload_lackey-$(TARGET_ARCH)-linux.so +vg_local_module := vgpreload_lackey +vg_local_module_class := SHARED_LIBRARIES +vg_local_target := SHARED_LIBRARY +vg_local_src_files := +vg_local_ldflags := $(preload_ldflags) +vg_local_cflags := $(common_cflags) +include $(LOCAL_PATH)/Android.build_all.mk + # Build none-$(TARGET_ARCH)-linux vg_local_module := none vg_local_module_class := SHARED_LIBRARIES @@ -600,6 +621,19 @@ LOCAL_CFLAGS_$(TARGET_ARCH) = $(target_arch_cflags) include $(BUILD_EXECUTABLE) +# Build standalone vgdb +include $(CLEAR_VARS) +LOCAL_MODULE := vgdb +LOCAL_ARM_MODE := arm +LOCAL_SRC_FILES := \ + coregrind/vgdb.c \ + coregrind/vgdb-invoker-none.c + +LOCAL_C_INCLUDES := $(common_includes) +LOCAL_CFLAGS := $(common_cflags) +LOCAL_CFLAGS_$(TARGET_ARCH) = $(target_arch_cflags) +include $(BUILD_EXECUTABLE) + # Build valgrind for linux host ifeq ($(HOST_OS), linux) include $(CLEAR_VARS) |