commit 36683d0fc88e2f23181bea8bb12a143ac2bcafae
author Tao Bao <tbao@google.com> Tue Apr 25 15:55:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 15:55:17 2017 +0000
tree 0e8aa2dadc405b9e086747b48a5f6c9d6bf1ac07
parent 54f8988cfe276380211b6832975674da914b07c4
parent 2dad1a9d28d5b81ce5e1b5388d227f025474a7ed

Merge "recovery: Remove the include of adb.h." am: dff2276012
am: 2dad1a9d28

Change-Id: I19dc6c2adf91b695412d79cfcd8cf759afcf6cf3

Android.mk

diff --git a/Android.mk b/Android.mk
index 5e2ddde..01c72a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,11 +92,9 @@
 
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 LOCAL_CFLAGS += -Wno-unused-parameter -Werror
-LOCAL_CLANG := true
 
 LOCAL_C_INCLUDES += \
     system/vold \
-    system/core/adb \
 
 LOCAL_STATIC_LIBRARIES := \
     librecovery \

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 99126ee..5876981 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -40,7 +40,6 @@
 #include <string>
 #include <vector>
 
-#include <adb.h>
 #include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/parseint.h>