aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Tarasov <vtarasov@google.com>2018-03-03 00:25:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-03 00:25:34 +0000
commit536792a9edfa3ef7bdf1f75decaa4ad5d5f0409b (patch)
tree3ac9eb94a77d88b8b669e2b2f1074ea20a6d9ab4
parente8e27d437641fc915e8475ee6c0783073925d76f (diff)
parent58ec2b6685dcce7dfd59109bb4cd037aee11dfae (diff)
downloadvalgrind-536792a9edfa3ef7bdf1f75decaa4ad5d5f0409b.tar.gz
Merge "Build vgdb and lackey tools" am: 4d49239373
am: 58ec2b6685 Change-Id: I6f1b9a8e91b235d462c047df7e36fe972f31fafa
-rw-r--r--Android.mk34
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)