Merge changes from topic "adbd_apex"
* changes:
Move adbd to an apex.
adbd: use libadbd_auth for authentication.
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index 70e4dd4..7277cc8 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -205,7 +205,11 @@
// descriptor will always be open.
adbd_cloexec_auth_socket();
-#if defined(ALLOW_ADBD_NO_AUTH)
+#if defined(__ANDROID_RECOVERY__)
+ if (is_device_unlocked() || __android_log_is_debuggable()) {
+ auth_required = false;
+ }
+#elif defined(ALLOW_ADBD_NO_AUTH)
// If ro.adb.secure is unset, default to no authentication required.
auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
#elif defined(__ANDROID__)
diff --git a/libziparchive/unzip.cpp b/libziparchive/unzip.cpp
index 7332b41..e4839b4 100644
--- a/libziparchive/unzip.cpp
+++ b/libziparchive/unzip.cpp
@@ -19,6 +19,7 @@
#include <fnmatch.h>
#include <getopt.h>
#include <inttypes.h>
+#include <libgen.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>