summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-04-25 17:59:18 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-04-25 17:59:18 +0200
commitd70cfe3f854a20c1517d87700f7ad29a2b4464d1 (patch)
treeac7781d34c4efb65118a810f5129e9921fef4b0c
parentAdd more tests for verify_package_compatibility(). am: b4c0de6c7b -s ours (diff)
parentMerge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 (diff)
downloadandroid_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar.gz
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar.bz2
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar.lz
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar.xz
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.tar.zst
android_bootable_recovery-d70cfe3f854a20c1517d87700f7ad29a2b4464d1.zip
-rw-r--r--Android.mk2
-rw-r--r--recovery.cpp1
2 files changed, 0 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 5e2dddec4..01c72a476 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,11 +92,9 @@ endif
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 \
diff --git a/recovery.cpp b/recovery.cpp
index 99126eedc..587698170 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>