18 files changed, 91 insertions, 0 deletions

diff --git a/minadbd.old/Android.mk b/minadbd.old/Android.mk
new file mode 100644
index 000000000..19c8b6047
--- /dev/null
+++ b/minadbd.old/Android.mk
@@ -0,0 +1,30 @@
+# Copyright 2005 The Android Open Source Project
+#
+# Android.mk for adb
+#
+
+LOCAL_PATH:= $(call my-dir)
+
+# minadbd library
+# =========================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	adb.c \
+	fdevent.c \
+	fuse_adb_provider.c \
+	transport.c \
+	transport_usb.c \
+	sockets.c \
+	services.c \
+	usb_linux_client.c \
+	utils.c
+
+LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
+LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE := libminadbd
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../
+LOCAL_SHARED_LIBRARIES := libfusesideload libcutils libc
+include $(BUILD_SHARED_LIBRARY)
diff --git a/minadbd.old/README.txt b/minadbd.old/README.txt
new file mode 100644
index 000000000..c9df484c3
--- /dev/null
+++ b/minadbd.old/README.txt
@@ -0,0 +1,39 @@
+The contents of this directory are copied from system/core/adb, with
+the following changes:
+
+adb.c
+  - much support for host mode and non-linux OS's stripped out; this
+    version only runs as adbd on the device.
+  - always setuid/setgid's itself to the shell user
+  - only uses USB transport
+  - references to JDWP removed
+  - main() removed
+  - all ADB_HOST and win32 code removed
+  - removed listeners, logging code, background server (for host)
+
+adb.h
+  - minor changes to match adb.c changes
+
+sockets.c
+  - references to JDWP removed
+  - ADB_HOST code removed
+
+services.c
+  - all services except echo_service (which is commented out) removed
+  - all host mode support removed
+  - sideload_service() added; this is the only service supported.  It
+    receives a single blob of data, writes it to a fixed filename, and
+    makes the process exit.
+
+Android.mk
+  - only builds in adbd mode; builds as static library instead of a
+    standalone executable.
+
+sysdeps.h
+  - changes adb_creat() to use O_NOFOLLOW
+
+transport.c
+  - removed ADB_HOST code
+
+transport_usb.c
+  - removed ADB_HOST code
diff --git a/minadbd/adb.c b/minadbd.old/adb.c
index c35e8300b..c35e8300b 100644
--- a/minadbd/adb.c
+++ b/minadbd.old/adb.c
diff --git a/minadbd/adb.h b/minadbd.old/adb.h
index 08ee989d6..08ee989d6 100644
--- a/minadbd/adb.h
+++ b/minadbd.old/adb.h
diff --git a/minadbd/fdevent.c b/minadbd.old/fdevent.c
index 5c374a71b..5c374a71b 100644
--- a/minadbd/fdevent.c
+++ b/minadbd.old/fdevent.c
diff --git a/minadbd/fdevent.h b/minadbd.old/fdevent.h
index a0ebe2a7e..a0ebe2a7e 100644
--- a/minadbd/fdevent.h
+++ b/minadbd.old/fdevent.h
diff --git a/minadbd/fuse_adb_provider.c b/minadbd.old/fuse_adb_provider.c
index f80533a8c..f80533a8c 100644
--- a/minadbd/fuse_adb_provider.c
+++ b/minadbd.old/fuse_adb_provider.c
diff --git a/minadbd.old/fuse_adb_provider.h b/minadbd.old/fuse_adb_provider.h
new file mode 100644
index 000000000..0eb1f79d1
--- /dev/null
+++ b/minadbd.old/fuse_adb_provider.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FUSE_ADB_PROVIDER_H
+#define __FUSE_ADB_PROVIDER_H
+
+int run_adb_fuse(int sfd, uint64_t file_size, uint32_t block_size);
+
+#endif
diff --git a/minadbd/mutex_list.h b/minadbd.old/mutex_list.h
index 652dd7341..652dd7341 100644
--- a/minadbd/mutex_list.h
+++ b/minadbd.old/mutex_list.h
diff --git a/minadbd/services.c b/minadbd.old/services.c
index 218b84a38..218b84a38 100644
--- a/minadbd/services.c
+++ b/minadbd.old/services.c
diff --git a/minadbd/sockets.c b/minadbd.old/sockets.c
index 817410d13..817410d13 100644
--- a/minadbd/sockets.c
+++ b/minadbd.old/sockets.c
diff --git a/minadbd/sysdeps.h b/minadbd.old/sysdeps.h
index 800ddb753..800ddb753 100644
--- a/minadbd/sysdeps.h
+++ b/minadbd.old/sysdeps.h
diff --git a/minadbd/transport.c b/minadbd.old/transport.c
index 92679f518..92679f518 100644
--- a/minadbd/transport.c
+++ b/minadbd.old/transport.c
diff --git a/minadbd/transport.h b/minadbd.old/transport.h
index 992e05285..992e05285 100644
--- a/minadbd/transport.h
+++ b/minadbd.old/transport.h
diff --git a/minadbd/transport_usb.c b/minadbd.old/transport_usb.c
index 91cbf6151..91cbf6151 100644
--- a/minadbd/transport_usb.c
+++ b/minadbd.old/transport_usb.c
diff --git a/minadbd/usb_linux_client.c b/minadbd.old/usb_linux_client.c
index ec32bcf91..ec32bcf91 100644
--- a/minadbd/usb_linux_client.c
+++ b/minadbd.old/usb_linux_client.c
diff --git a/minadbd/utils.c b/minadbd.old/utils.c
index 91518bab6..91518bab6 100644
--- a/minadbd/utils.c
+++ b/minadbd.old/utils.c
diff --git a/minadbd/utils.h b/minadbd.old/utils.h
index f70ecd24d..f70ecd24d 100644
--- a/minadbd/utils.h
+++ b/minadbd.old/utils.h