Merge "adbd: make static." am: b41b33581e
am: 51c06da6ca

Change-Id: I9170ca4973d9ee066c1c9ad7d8cb4f90d92837b5
diff --git a/adb/Android.bp b/adb/Android.bp
index ef425c1..bbf7cb4 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -260,6 +260,9 @@
     name: "adbd",
     defaults: ["adb_defaults"],
 
+    // adbd must be static, as it is copied into the recovery image.
+    static_executable: true,
+
     srcs: [
         "daemon/main.cpp",
         "daemon/mdns.cpp",