commit 1ddd35050417b79307c5e0a989ee39d6ce2bfc1b
author Dan Albert <danalbert@google.com> Wed Feb 18 15:58:15 2015 -0800
committer Dan Albert <danalbert@google.com> Wed Feb 18 16:14:16 2015 -0800
tree 1c240abf3ee1868ea903618d474b7aae247ab6e6
parent bbf627a68e47319b1fcacb1487ab1d1618c3a82d

Use headers from adb.

adb.h has diverged a bit, so that one will be more involved, but these
three are all trivial, unimportant changes.

Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6

Android.mk

diff --git a/Android.mk b/Android.mk
index 0cb0836..b8ef63e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,7 +54,10 @@
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 LOCAL_CFLAGS += -Wno-unused-parameter
 
-LOCAL_C_INCLUDES += system/vold
+LOCAL_C_INCLUDES += \
+    system/vold \
+    system/extras/ext4_utils \
+    system/core/adb \
 
 LOCAL_STATIC_LIBRARIES := \
     libext4_utils_static \
@@ -94,8 +97,6 @@
   LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
 endif
 
-LOCAL_C_INCLUDES += system/extras/ext4_utils
-
 include $(BUILD_EXECUTABLE)
 
 # All the APIs for testing