commit ec900bba20630934dc51a1b3a57d6d7a30fed325
author Paul Lawrence <paullawrence@google.com> Thu Oct 09 14:22:49 2014 +0000
committer Elliott Hughes <enh@google.com> Tue Dec 09 17:02:17 2014 -0800
tree 50d20668d3fb0891ccaf251f38e7273e3ad857d8
parent 7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2

Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""

This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33.

Fixed build error, and also fixed memory leak spotted from warning.

(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981

fs_mgr/Android.mk

diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index 7cffc37..61bf1ee 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -13,6 +13,10 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -Werror
 
+ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
+endif
+
 include $(BUILD_STATIC_LIBRARY)