Merge "Fix typo in radio_metadata_t definition."
diff --git a/adb/Android.mk b/adb/Android.mk
index fab8c87..49e492c 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -336,7 +336,7 @@
libfec_rs \
libselinux \
liblog \
- libext4_utils_static \
+ libext4_utils \
libsquashfs_utils \
libcutils \
libbase \
diff --git a/adb/adb.h b/adb/adb.h
index 19f09a3..7db3b15 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -218,8 +218,6 @@
#define CHUNK_SIZE (64*1024)
#if !ADB_HOST
-#define USB_ADB_PATH "/dev/android_adb"
-
#define USB_FFS_ADB_PATH "/dev/usb-ffs/adb/"
#define USB_FFS_ADB_EP(x) USB_FFS_ADB_PATH#x
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index 78434a0..1a39f6a 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -170,7 +170,7 @@
drop_privileges(server_port);
bool is_usb = false;
- if (access(USB_ADB_PATH, F_OK) == 0 || access(USB_FFS_ADB_EP0, F_OK) == 0) {
+ if (access(USB_FFS_ADB_EP0, F_OK) == 0) {
// Listen on USB.
usb_init();
is_usb = true;
diff --git a/adb/usb_linux_client.cpp b/adb/usb_linux_client.cpp
index 1cc7f68..a21a193 100644
--- a/adb/usb_linux_client.cpp
+++ b/adb/usb_linux_client.cpp
@@ -74,9 +74,6 @@
void (*kick)(usb_handle *h);
void (*close)(usb_handle *h);
- // Legacy f_adb
- int fd = -1;
-
// FunctionFS
int control = -1;
int bulk_out = -1; /* "out" from the host's perspective => source for adbd */
@@ -248,141 +245,7 @@
},
};
-static void usb_adb_open_thread(void* x) {
- struct usb_handle *usb = (struct usb_handle *)x;
- int fd;
-
- adb_thread_setname("usb open");
-
- while (true) {
- // wait until the USB device needs opening
- std::unique_lock<std::mutex> lock(usb->lock);
- while (!usb->open_new_connection) {
- usb->notify.wait(lock);
- }
- usb->open_new_connection = false;
- lock.unlock();
-
- D("[ usb_thread - opening device ]");
- do {
- /* XXX use inotify? */
- fd = unix_open("/dev/android_adb", O_RDWR);
- if (fd < 0) {
- // to support older kernels
- fd = unix_open("/dev/android", O_RDWR);
- }
- if (fd < 0) {
- std::this_thread::sleep_for(1s);
- }
- } while (fd < 0);
- D("[ opening device succeeded ]");
-
- close_on_exec(fd);
- usb->fd = fd;
-
- D("[ usb_thread - registering device ]");
- register_usb_transport(usb, 0, 0, 1);
- }
-
- // never gets here
- abort();
-}
-
-static int usb_adb_write(usb_handle *h, const void *data, int len)
-{
- int n;
-
- D("about to write (fd=%d, len=%d)", h->fd, len);
- n = unix_write(h->fd, data, len);
- if(n != len) {
- D("ERROR: fd = %d, n = %d, errno = %d (%s)",
- h->fd, n, errno, strerror(errno));
- return -1;
- }
- if (h->kicked) {
- D("usb_adb_write finished due to kicked");
- return -1;
- }
- D("[ done fd=%d ]", h->fd);
- return 0;
-}
-
-static int usb_adb_read(usb_handle *h, void *data, int len)
-{
- D("about to read (fd=%d, len=%d)", h->fd, len);
- while (len > 0) {
- // The kernel implementation of adb_read in f_adb.c doesn't support
- // reads larger then 4096 bytes. Read the data in 4096 byte chunks to
- // avoid the issue. (The ffs implementation doesn't have this limit.)
- int bytes_to_read = len < 4096 ? len : 4096;
- int n = unix_read(h->fd, data, bytes_to_read);
- if (n != bytes_to_read) {
- D("ERROR: fd = %d, n = %d, errno = %d (%s)",
- h->fd, n, errno, strerror(errno));
- return -1;
- }
- if (h->kicked) {
- D("usb_adb_read finished due to kicked");
- return -1;
- }
- len -= n;
- data = ((char*)data) + n;
- }
- D("[ done fd=%d ]", h->fd);
- return 0;
-}
-
-static void usb_adb_kick(usb_handle *h) {
- D("usb_kick");
- // Other threads may be calling usb_adb_read/usb_adb_write at the same time.
- // If we close h->fd, the file descriptor will be reused to open other files,
- // and the read/write thread may operate on the wrong file. So instead
- // we set the kicked flag and reopen h->fd to a dummy file here. After read/write
- // threads finish, we close h->fd in usb_adb_close().
- h->kicked = true;
- TEMP_FAILURE_RETRY(dup2(dummy_fd, h->fd));
-}
-
-static void usb_adb_close(usb_handle *h) {
- h->kicked = false;
- adb_close(h->fd);
- // Notify usb_adb_open_thread to open a new connection.
- h->lock.lock();
- h->open_new_connection = true;
- h->lock.unlock();
- h->notify.notify_one();
-}
-
-static void usb_adb_init()
-{
- usb_handle* h = new usb_handle();
-
- h->write = usb_adb_write;
- h->read = usb_adb_read;
- h->kick = usb_adb_kick;
- h->close = usb_adb_close;
-
- // Open the file /dev/android_adb_enable to trigger
- // the enabling of the adb USB function in the kernel.
- // We never touch this file again - just leave it open
- // indefinitely so the kernel will know when we are running
- // and when we are not.
- int fd = unix_open("/dev/android_adb_enable", O_RDWR);
- if (fd < 0) {
- D("failed to open /dev/android_adb_enable");
- } else {
- close_on_exec(fd);
- }
-
- D("[ usb_init - starting thread ]");
- if (!adb_thread_create(usb_adb_open_thread, h)) {
- fatal_errno("cannot create usb thread");
- }
-}
-
-
-static bool init_functionfs(struct usb_handle *h)
-{
+static bool init_functionfs(struct usb_handle* h) {
ssize_t ret;
struct desc_v1 v1_descriptor;
struct desc_v2 v2_descriptor;
@@ -463,7 +326,7 @@
}
static void usb_ffs_open_thread(void* x) {
- struct usb_handle *usb = (struct usb_handle *)x;
+ struct usb_handle* usb = (struct usb_handle*)x;
adb_thread_setname("usb ffs open");
@@ -530,8 +393,7 @@
return 0;
}
-static void usb_ffs_kick(usb_handle *h)
-{
+static void usb_ffs_kick(usb_handle* h) {
int err;
err = ioctl(h->bulk_in, FUNCTIONFS_CLEAR_HALT);
@@ -553,7 +415,7 @@
TEMP_FAILURE_RETRY(dup2(dummy_fd, h->bulk_in));
}
-static void usb_ffs_close(usb_handle *h) {
+static void usb_ffs_close(usb_handle* h) {
h->kicked = false;
adb_close(h->bulk_out);
adb_close(h->bulk_in);
@@ -564,8 +426,7 @@
h->notify.notify_one();
}
-static void usb_ffs_init()
-{
+static void usb_ffs_init() {
D("[ usb_init - using FunctionFS ]");
usb_handle* h = new usb_handle();
@@ -581,33 +442,25 @@
}
}
-void usb_init()
-{
+void usb_init() {
dummy_fd = adb_open("/dev/null", O_WRONLY);
CHECK_NE(dummy_fd, -1);
- if (access(USB_FFS_ADB_EP0, F_OK) == 0)
- usb_ffs_init();
- else
- usb_adb_init();
+ usb_ffs_init();
}
-int usb_write(usb_handle *h, const void *data, int len)
-{
+int usb_write(usb_handle* h, const void* data, int len) {
return h->write(h, data, len);
}
-int usb_read(usb_handle *h, void *data, int len)
-{
+int usb_read(usb_handle* h, void* data, int len) {
return h->read(h, data, len);
}
-int usb_close(usb_handle *h)
-{
+int usb_close(usb_handle* h) {
h->close(h);
return 0;
}
-void usb_kick(usb_handle *h)
-{
+void usb_kick(usb_handle* h) {
h->kick(h);
}
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 286de5b..5610cc0 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -57,8 +57,8 @@
LOCAL_STATIC_LIBRARIES := \
libziparchive \
- libext4_utils_host \
- libsparse_host \
+ libext4_utils \
+ libsparse \
libutils \
liblog \
libz \
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index 8997cab..9e06bc5 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -9,7 +9,7 @@
libbase \
libcrypto_utils \
libcrypto \
- libext4_utils_static \
+ libext4_utils \
libsquashfs_utils \
libselinux
@@ -57,7 +57,7 @@
libcutils \
liblog \
libc \
- libsparse_static \
+ libsparse \
libz \
libselinux
LOCAL_CXX_STL := libc++_static
diff --git a/init/Android.mk b/init/Android.mk
index 111fe89..6615692 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -92,7 +92,7 @@
libsquashfs_utils \
liblogwrap \
libcutils \
- libext4_utils_static \
+ libext4_utils \
libbase \
libc \
libselinux \
@@ -101,7 +101,7 @@
libcrypto \
libc++_static \
libdl \
- libsparse_static \
+ libsparse \
libz \
libprocessgroup \
libnl \
diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 7a6ae8a..dd8b5fd 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -1,7 +1,9 @@
// Copyright 2010 The Android Open Source Project
-cc_defaults {
- name: "libsparse_defaults",
+cc_library {
+ name: "libsparse",
+ host_supported: true,
+ unique_host_soname: true,
srcs: [
"backed_block.c",
"output_file.c",
@@ -13,32 +15,19 @@
cflags: ["-Werror"],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
-}
-
-cc_library_host_static {
- name: "libsparse_host",
- defaults: ["libsparse_defaults"],
- static_libs: ["libz"],
target: {
+ host: {
+ shared_libs: ["libz-host"],
+ },
+ android: {
+ shared_libs: ["libz"],
+ },
windows: {
enabled: true,
},
},
}
-cc_library_shared {
- name: "libsparse",
- defaults: ["libsparse_defaults"],
- shared_libs: ["libz"],
-}
-
-cc_library_static {
- name: "libsparse_static",
- host_supported: true,
- defaults: ["libsparse_defaults"],
- static_libs: ["libz"],
-}
-
cc_binary {
name: "simg2img",
host_supported: true,
@@ -47,7 +36,7 @@
"sparse_crc32.c",
],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],
@@ -59,7 +48,7 @@
host_supported: true,
srcs: ["img2simg.c"],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],
@@ -70,7 +59,7 @@
name: "append2simg",
srcs: ["append2simg.c"],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],
diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 8725113..0633a68 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -38,8 +38,6 @@
# these should not be world writable
/dev/diag 0660 radio radio
/dev/diag_arm9 0660 radio radio
-/dev/android_adb 0660 adb adb
-/dev/android_adb_enable 0660 adb adb
/dev/ttyMSM0 0600 bluetooth bluetooth
/dev/uhid 0660 system bluetooth
/dev/uinput 0660 system bluetooth
