commit b9c37922b7b445dc86c2c5eb3266c83bd88c5cb2
author Jeff Sharkey <jsharkey@android.com> Wed Aug 08 14:02:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 08 14:02:15 2012 -0700
tree dea9829a7caa50cc02783d0a3beb59db8acbdaac
parent 2f096c3a96a715caaeb0746c8041e9dc9e62d6aa
parent 1d4214900cc5c07eceb3a98618fcfecdfa8dc903

am 1d421490: Merge "Include to define uid_t." into jb-mr1-dev

* commit '1d4214900cc5c07eceb3a98618fcfecdfa8dc903':
  Include to define uid_t.

include/cutils/multiuser.h

diff --git a/include/cutils/multiuser.h b/include/cutils/multiuser.h
index 191d80c..22bb032 100644
--- a/include/cutils/multiuser.h
+++ b/include/cutils/multiuser.h
@@ -17,6 +17,8 @@
 #ifndef __CUTILS_MULTIUSER_H
 #define __CUTILS_MULTIUSER_H
 
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 6d525ba..2477d23 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -50,8 +50,7 @@
 	threads.c \
 	sched_policy.c \
 	iosched_policy.c \
-	str_parms.c \
-	multiuser.c
+	str_parms.c
 
 commonHostSources := \
         ashmem-host.c
@@ -125,7 +124,8 @@
         mq.c \
         partition_utils.c \
         qtaguid.c \
-        uevent.c
+        uevent.c \
+        multiuser.c
 
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_SRC_FILES += arch-arm/memset32.S