Include Android Debug Bridge Daemon (adbd) to images

Change-Id: I00108d36be95e42b8aa9674d1a86ea7e3a5bcf55
Reviewed-by: Rainer Keller <rainer.keller@digia.com>

7 files changed, 283 insertions, 2 deletions

diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
new file mode 100644
index 0000000..1cc8882
--- /dev/null
+++ b/recipes/adbd/adbd.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Android Debug Bridge Daemon"
+HOMEPAGE = "http://developer.android.com/tools/help/adb.html"
+SECTION = "libs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://ThirdPartyProject.prop;md5=4e5987c5919a36739dc8f76a4e35d9eb"
+
+PR = "r0"
+SRCREV = "android-4.2.2_r1.2"
+
+SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https;tag=${SRCREV} \
+           file://adbd.patch \
+           file://Makefile.adbd \
+           file://adb-init \
+          "
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${bindir}/adbd"
+
+do_compile() {
+        make -C adb -f ${WORKDIR}/Makefile.adbd
+}
+
+do_install() {
+        install -m 0755 -d ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/git/adb/adbd ${D}${bindir}/
+
+        install -m 0755 -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/adb-init ${D}${sysconfdir}/init.d/
+}
+
+INITSCRIPT_NAME = "adb-init"
+INITSCRIPT_PARAMS = "defaults 96"
+
+inherit update-rc.d
diff --git a/recipes/adbd/files/Makefile.adbd b/recipes/adbd/files/Makefile.adbd
new file mode 100644
index 0000000..a24b670
--- /dev/null
+++ b/recipes/adbd/files/Makefile.adbd
@@ -0,0 +1,38 @@
+LOCAL_SRC_FILES := \
+        adb.c \
+        backup_service.c \
+        fdevent.c \
+        transport.c \
+        transport_local.c \
+        transport_usb.c \
+        adb_auth_client.c \
+        sockets.c \
+        services.c \
+        file_sync_service.c \
+        jdwp_service.c \
+        framebuffer_service.c \
+        remount_service.c \
+        usb_linux_client.c \
+        log_service.c \
+        utils.c
+
+LOCAL_OBJ_FILES=$(LOCAL_SRC_FILES:%.c=%.o)
+
+LIBCUTILS_SRC_FILES := \
+        ../libcutils/socket_inaddr_any_server.c \
+        ../libcutils/socket_local_client.c \
+        ../libcutils/socket_local_server.c \
+        ../libcutils/socket_loopback_client.c \
+        ../libcutils/socket_loopback_server.c \
+        ../libcutils/list.c
+
+LIBCUTILS_OBJ_FILES=$(LIBCUTILS_SRC_FILES:%.c=%.o)
+
+adbd: $(LOCAL_OBJ_FILES) $(LIBCUTILS_OBJ_FILES)
+        $(CC) $^ -o $@ -lcrypto -Wl,--as-needed -ldl -lpthread -lresolv
+
+../libcutils/%.o: ../libcutils/%.c
+        $(CC) -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC
+
+%.o: %.c
+        $(CC) -O2 -g -DALLOW_ADBD_ROOT -DADB_QEMU=0 -DADB_HOST=0 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC
diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
new file mode 100755
index 0000000..6f2910e
--- /dev/null
+++ b/recipes/adbd/files/adb-init
@@ -0,0 +1,22 @@
+#!/bin/sh
+case "$1" in
+start)
+    insmod $(busybox find /lib/modules/$(uname -r) -name "g_ffs.ko") idVendor=0x18d1 idProduct=0x4e26 iSerialNumber=$(hostname)
+    mkdir -p /dev/usb-ffs
+    chmod 770 /dev/usb-ffs
+    mkdir -p /dev/usb-ffs/adb
+    chmod 770 /dev/usb-ffs/adb
+    mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0
+
+    /usr/bin/adbd &
+    ;;
+stop)
+    killall adbd
+    umount /dev/usb-ffs/adb
+    rmmod g_ffs
+    ;;
+*)
+    echo "Usage: $0 {start|stop}"
+    exit 1
+esac
+exit 0
diff --git a/recipes/adbd/files/adbd.patch b/recipes/adbd/files/adbd.patch
new file mode 100644
index 0000000..110b021
--- /dev/null
+++ b/recipes/adbd/files/adbd.patch
@@ -0,0 +1,177 @@
+diff --git a/adb/adb.c b/adb/adb.c
+index 07bfbe5..c8f37ff 100644
+--- a/adb/adb.c
++++ b/adb/adb.c
+@@ -141,7 +141,7 @@ void  adb_trace_init(void)
+     }
+ }
+ 
+-#if !ADB_HOST
++#if !ADB_HOST && ADB_QEMU
+ /*
+  * Implements ADB tracing inside the emulator.
+  */
+@@ -282,6 +282,22 @@ static void send_close(unsigned local, unsigned remote, atransport *t)
+     send_packet(p, t);
+ }
+ 
++int property_set(const char *key, const char *value)
++{
++    return 0;
++}
++
++int property_get(const char *key, char *value, const char *fallback)
++{
++    if (fallback) {
++        strncpy(value, fallback, PROPERTY_VALUE_MAX-1);
++        return strlen(fallback);
++    } else {
++        value[0] = 0;
++        return 0;
++    }
++}
++
+ static size_t fill_connect_data(char *buf, size_t bufsize)
+ {
+ #if ADB_HOST
+@@ -1056,31 +1072,7 @@ static int should_drop_privileges() {
+ #ifndef ALLOW_ADBD_ROOT
+     return 1;
+ #else /* ALLOW_ADBD_ROOT */
+-    int secure = 0;
+-    char value[PROPERTY_VALUE_MAX];
+-
+-   /* run adbd in secure mode if ro.secure is set and
+-    ** we are not in the emulator
+-    */
+-    property_get("ro.kernel.qemu", value, "");
+-    if (strcmp(value, "1") != 0) {
+-        property_get("ro.secure", value, "1");
+-        if (strcmp(value, "1") == 0) {
+-            // don't run as root if ro.secure is set...
+-            secure = 1;
+-
+-            // ... except we allow running as root in userdebug builds if the
+-            // service.adb.root property has been set by the "adb root" command
+-            property_get("ro.debuggable", value, "");
+-            if (strcmp(value, "1") == 0) {
+-                property_get("service.adb.root", value, "");
+-                if (strcmp(value, "1") == 0) {
+-                    secure = 0;
+-                }
+-            }
+-        }
+-    }
+-    return secure;
++    return 0;
+ #endif /* ALLOW_ADBD_ROOT */
+ }
+ #endif /* !ADB_HOST */
+@@ -1543,7 +1535,9 @@ int main(int argc, char **argv)
+ #else
+     /* If adbd runs inside the emulator this will enable adb tracing via
+      * adb-debug qemud service in the emulator. */
++#if ADB_QEMU
+     adb_qemu_trace_init();
++#endif
+     if((argc > 1) && (!strcmp(argv[1],"recovery"))) {
+         adb_device_banner = "recovery";
+         recovery_mode = 1;
+diff --git a/adb/adb.h b/adb/adb.h
+index 9da8af8..ae3dd31 100644
+--- a/adb/adb.h
++++ b/adb/adb.h
+@@ -363,7 +363,7 @@ typedef enum {
+ 
+ #if ADB_TRACE
+ 
+-#if !ADB_HOST
++#if !ADB_HOST && ADB_QEMU
+ /*
+  * When running inside the emulator, guest's adbd can connect to 'adb-debug'
+  * qemud service that can display adb trace messages (on condition that emulator
+diff --git a/adb/remount_service.c b/adb/remount_service.c
+index 4cb41e7..6cfc2c6 100644
+--- a/adb/remount_service.c
++++ b/adb/remount_service.c
+@@ -77,12 +77,12 @@ static int remount_system()
+         return 0;
+     }
+ 
+-    dev = find_mount("/system");
++    dev = find_mount("/");
+ 
+     if (!dev)
+         return -1;
+ 
+-    system_ro = mount(dev, "/system", "none", MS_REMOUNT, NULL);
++    system_ro = mount(dev, "/", "none", MS_REMOUNT, NULL);
+ 
+     free(dev);
+ 
+diff --git a/adb/services.c b/adb/services.c
+index 495a083..eb895ae 100644
+--- a/adb/services.c
++++ b/adb/services.c
+@@ -33,7 +33,7 @@
+ #    include <sys/ioctl.h>
+ #  endif
+ #else
+-#  include <cutils/android_reboot.h>
++#  include <linux/reboot.h>
+ #endif
+ 
+ typedef struct stinfo stinfo;
+@@ -182,7 +182,7 @@ void reboot_service(int fd, void *arg)
+         waitpid(pid, &ret, 0);
+     }
+ 
+-    ret = android_reboot(ANDROID_RB_RESTART2, 0, (char *) arg);
++    ret = reboot(LINUX_REBOOT_CMD_RESTART2, 0, (char *) arg);
+     if (ret < 0) {
+         snprintf(buf, sizeof(buf), "reboot failed: %s\n", strerror(errno));
+         writex(fd, buf, strlen(buf));
+@@ -334,7 +334,7 @@ static int create_subprocess(const char *cmd, const char *arg0, const char *arg1
+ #if ADB_HOST
+ #define SHELL_COMMAND "/bin/sh"
+ #else
+-#define SHELL_COMMAND "/system/bin/sh"
++#define SHELL_COMMAND "/bin/sh"
+ #endif
+ 
+ #if !ADB_HOST
+diff --git a/adb/transport_local.c b/adb/transport_local.c
+index 96a24ba..51c85fc 100644
+--- a/adb/transport_local.c
++++ b/adb/transport_local.c
+@@ -186,7 +186,7 @@ static void *server_socket_thread(void * arg)
+ }
+ 
+ /* This is relevant only for ADB daemon running inside the emulator. */
+-#if !ADB_HOST
++#if !ADB_HOST && ADB_QEMU
+ /*
+  * Redefine open and write for qemu_pipe.h that contains inlined references
+  * to those routines. We will redifine them back after qemu_pipe.h inclusion.
+@@ -304,7 +304,7 @@ void local_init(int port)
+     if(HOST) {
+         func = client_socket_thread;
+     } else {
+-#if ADB_HOST
++#if ADB_HOST || !ADB_QEMU
+         func = server_socket_thread;
+ #else
+         /* For the adbd daemon in the system image we need to distinguish
+diff --git a/adb/transport_usb.c b/adb/transport_usb.c
+index ee6b637..c5e1408 100644
+--- a/adb/transport_usb.c
++++ b/adb/transport_usb.c
+@@ -18,7 +18,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <sysdeps.h>
++#include "sysdeps.h"
+ 
+ #define  TRACE_TAG  TRACE_TRANSPORT
+ #include "adb.h"
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 494b433..dbcd8f8 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -60,6 +60,8 @@ IMAGE_INSTALL += "\
         freetype \
         fontconfig \
         liberation-fonts \
+        adbd \
+        kernel-module-g-ffs \
         ${GSTREAMER_EXTRA_INSTALL} \
         ${TOOLS_EXTRA_INSTALL} \
         ${MACHINE_EXTRA_INSTALL} \
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend
index fff9f24..6d30629 100644
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ b/recipes/linux/linux-boundary_3.0.35.bbappend
@@ -3,4 +3,7 @@ do_configure_prepend() {
         # Use multitouch protocol for touchscreen that support it
         echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
         echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 }
diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend
index 0cfda85..1e979da 100644
--- a/recipes/linux/linux-mainline_3.2.bbappend
+++ b/recipes/linux/linux-mainline_3.2.bbappend
@@ -1,7 +1,11 @@
-
 do_configure_prepend() {
         # Builtin network driver, so networking is initialized correctly during boot
-        echo "CONFIG_USB_NET_SMSC95XX=y"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_NET_SMSC95XX=y"        >> ${WORKDIR}/defconfig
+
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS_ETH=n"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_FUNCTIONFS_RNDIS=n"    >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_FUNCTIONFS_GENERIC=y"  >> ${WORKDIR}/defconfig
 
         # Remove beagleboard logo
         if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then