summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-09-27 01:19:32 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-09-27 01:19:32 +0200
commite0cb5d5c1e3fecd0101fbfdab3b229e48b34a984 (patch)
tree2fa17f82041bb368389eec8b488e7304d5661ebc /install
parentMerge "Use libcrypto_static instead of libcrypto" am: 4c4c7dc26b (diff)
parentMerge "minadbd: Export minadbd/types.h to libinstall." (diff)
downloadandroid_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar.gz
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar.bz2
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar.lz
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar.xz
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.tar.zst
android_bootable_recovery-e0cb5d5c1e3fecd0101fbfdab3b229e48b34a984.zip
Diffstat (limited to 'install')
-rw-r--r--install/Android.bp8
-rw-r--r--install/adb_install.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/install/Android.bp b/install/Android.bp
index 89cc3f23e..78c3a5784 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -19,10 +19,6 @@ cc_defaults {
"recovery_defaults",
],
- header_libs: [
- "libminadbd_headers",
- ],
-
shared_libs: [
"libbase",
"libbootloader_message",
@@ -69,6 +65,10 @@ cc_library_static {
"wipe_device.cpp",
],
+ header_libs: [
+ "libminadbd_headers",
+ ],
+
shared_libs: [
"librecovery_ui",
],
diff --git a/install/adb_install.cpp b/install/adb_install.cpp
index ed664429a..ee79a32c0 100644
--- a/install/adb_install.cpp
+++ b/install/adb_install.cpp
@@ -44,7 +44,7 @@
#include "fuse_sideload.h"
#include "install/install.h"
#include "install/wipe_data.h"
-#include "minadbd_types.h"
+#include "minadbd/types.h"
#include "otautil/sysutil.h"
#include "recovery_ui/device.h"
#include "recovery_ui/ui.h"