diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-14 06:59:11 +0100 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-14 06:59:11 +0100 |
| commit | b8838e6bf207ed2677ab4b3bef79f685193f175e (patch) | |
| tree | cdbf3e3a300d059d92a7ca641fe1a56672b5279e | |
| parent | git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master" (diff) | |
| parent | Merge "Remove unused libutils references." (diff) | |
| download | android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar.gz android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar.bz2 android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar.lz android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar.xz android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.tar.zst android_bootable_recovery-b8838e6bf207ed2677ab4b3bef79f685193f175e.zip | |
| -rw-r--r-- | minadbd/Android.mk | 2 | ||||
| -rw-r--r-- | minadbd/fuse_adb_provider_test.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 79fe96b93..52d3fa4e4 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -31,6 +31,6 @@ LOCAL_SRC_FILES := fuse_adb_provider_test.cpp LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_C_INCLUDES := $(LOCAL_PATH) system/core/adb LOCAL_STATIC_LIBRARIES := libminadbd -LOCAL_SHARED_LIBRARIES := liblog libutils +LOCAL_SHARED_LIBRARIES := liblog include $(BUILD_NATIVE_TEST) diff --git a/minadbd/fuse_adb_provider_test.cpp b/minadbd/fuse_adb_provider_test.cpp index ecd9f384b..0f2e881c7 100644 --- a/minadbd/fuse_adb_provider_test.cpp +++ b/minadbd/fuse_adb_provider_test.cpp @@ -25,7 +25,6 @@ #include <string> #include "adb_io.h" -#include "utils/file.h" TEST(fuse_adb_provider, read_block_adb) { adb_data data = {}; |