summaryrefslogtreecommitdiffstats
path: root/adb/Android.mk
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-10-09 13:24:06 -0700
committerPaul Lawrence <paullawrence@google.com>2014-10-09 13:24:06 -0700
commitcc496dbcd709230c35016e3d84ad06d1e44de9b8 (patch)
tree6011bf2ed3c90eb57f4cc0c9fb783d95f9a1fd74 /adb/Android.mk
parent3e64bf45e65641c0dd946de6eefa552718f14c1c (diff)
parentae413a71cb7201a08d7e9a8b051b8d2ea61207ed (diff)
downloadsystem_core-cc496dbcd709230c35016e3d84ad06d1e44de9b8.zip
system_core-cc496dbcd709230c35016e3d84ad06d1e44de9b8.tar.gz
system_core-cc496dbcd709230c35016e3d84ad06d1e44de9b8.tar.bz2
resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp
Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
Diffstat (limited to 'adb/Android.mk')
-rw-r--r--adb/Android.mk16
1 files changed, 15 insertions, 1 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index 3828ed3..6271483 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -113,6 +113,7 @@ LOCAL_SRC_FILES := \
jdwp_service.c \
framebuffer_service.c \
remount_service.c \
+ disable_verity_service.c \
usb_linux_client.c
LOCAL_CFLAGS := \
@@ -127,14 +128,27 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1
endif
+ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
+endif
+
LOCAL_MODULE := adbd
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
+LOCAL_C_INCLUDES += system/extras/ext4_utils system/core/fs_mgr/include
+
+LOCAL_STATIC_LIBRARIES := liblog \
+ libfs_mgr \
+ libcutils \
+ libc \
+ libmincrypt \
+ libselinux \
+ libext4_utils_static
-LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt libselinux
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
include $(BUILD_EXECUTABLE)