commit 2dbef6ae08eec8815863b89046653a1a73443a7c
author Elliott Hughes <enh@google.com> Mon Sep 24 08:41:42 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 24 08:41:43 2012 -0700
tree 0881da1bef869780ff3eaf1142b2e4991e94eeba
parent 9796a83a39e757558c07e17bd277ab2694762dfd
parent d03072ffde3279fbb60591a0d07c820d8e792762

Merge "The localtime_tz and mktime_tz extensions are now in bionic."

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index abf5517..76be076 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -21,19 +21,20 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
-#include <linux/netlink.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/poll.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <time.h>
 #include <unistd.h>
 
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
 #include <cutils/android_reboot.h>
 #include <cutils/klog.h>
 #include <cutils/list.h>

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index b6eab8c..c9def7b 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -832,6 +832,11 @@
         return 0;
     }
 
+    if (argc > 0 && !strcmp(*argv, "help")) {
+        usage();
+        return 0;
+    }
+
     usb = open_device();
 
     while (argc > 0) {
@@ -922,9 +927,6 @@
             wants_reboot = 1;
         } else if(!strcmp(*argv, "oem")) {
             argc = do_oem_command(argc, argv);
-        } else if (!strcmp(*argv, "help")) {
-            usage();
-            return 0;
         } else {
             usage();
             return 1;

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 6521cbe..33ecd9a 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -87,6 +87,9 @@
 
 #define AID_USER        100000  /* offset for uid ranges for each user */
 
+#define AID_SHARED_GID_START 50000 /* start of gids for apps in each user to share */
+#define AID_SHARED_GID_END   59999 /* start of gids for apps in each user to share */
+
 #if !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
 struct android_id_info {
     const char *name;

libnl_2/genl/genl.c

diff --git a/libnl_2/genl/genl.c b/libnl_2/genl/genl.c
index 2442993..1e127af 100644
--- a/libnl_2/genl/genl.c
+++ b/libnl_2/genl/genl.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/time.h>
+#include <sys/socket.h>
 #include <linux/netlink.h>
 #include "netlink-types.h"
 

libnl_2/msg.c

diff --git a/libnl_2/msg.c b/libnl_2/msg.c
index 283da6e..1303e8a 100644
--- a/libnl_2/msg.c
+++ b/libnl_2/msg.c
@@ -18,6 +18,7 @@
 
 #include <malloc.h>
 #include <unistd.h>
+#include <sys/socket.h>
 #include <linux/netlink.h>
 #include "netlink-types.h"