diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-21 20:17:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-21 20:17:49 +0000 |
| commit | 512b225e6ba1958e5e03d13922a9092158ebdca2 (patch) | |
| tree | 3ac9eb94a77d88b8b669e2b2f1074ea20a6d9ab4 | |
| parent | 895a5f2b04556862f7ad1aaf7184a9fd9e2390f1 (diff) | |
| parent | 04aedc43f5f23eb3fd49fe390ded8449d4337688 (diff) | |
| download | valgrind-sdk-release.tar.gz | |
Merge "Snap for 4794708 from 4d492393733cfae4dd97fbc8971207905b37ff75 to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | Android.build_one.mk | 2 | ||||
| -rw-r--r-- | Android.mk | 39 |
2 files changed, 38 insertions, 3 deletions
diff --git a/Android.build_one.mk b/Android.build_one.mk index 62d2c4702..126ad1c8d 100644 --- a/Android.build_one.mk +++ b/Android.build_one.mk @@ -14,6 +14,8 @@ include $(CLEAR_VARS) +LOCAL_MODULE_TARGET_ARCH := $(VALGRIND_SUPPORTED_ARCH) + LOCAL_ARM_MODE := arm ifeq ($(vg_build_second_arch),true) LOCAL_MULTILIB := 32 diff --git a/Android.mk b/Android.mk index 8c3f8a226..a1c632473 100644 --- a/Android.mk +++ b/Android.mk @@ -16,7 +16,8 @@ LOCAL_PATH:= $(call my-dir) ANDROID_HARDWARE := ANDROID_HARDWARE_generic -ifneq ($(filter arm arm64 x86_64,$(TARGET_ARCH)),) +# When updating this list also update the list in art/build/Android.gtest.mk +VALGRIND_SUPPORTED_ARCH := arm arm64 x86_64 vg_arch:=$(TARGET_ARCH) @@ -567,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 @@ -599,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) @@ -654,5 +689,3 @@ LOCAL_SRC_FILES := bionic.supp include $(BUILD_PREBUILT) endif - -endif |