Snap for 4632767 from 7d3f5da415f0f6ae3d79565ec5422019e4b32d9c to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: I4000cf9f867c56f452bc76fe447c4a07cd971bac

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)