aboutsummaryrefslogtreecommitdiffstats
path: root/libcutils/Android.mk
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-08-16 14:32:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-16 14:33:00 -0700
commit2be5338a84f19b24b6515c0bfcf2f3f7b55262c1 (patch)
treebbe06c96de4f88b1cc484bc33f2e967403fab014 /libcutils/Android.mk
parentedb2d634b35ec1b0268ac7d9ddab8c8fc082a14e (diff)
parent885342a0f2c834a6b680284047c47c9d04b32565 (diff)
downloadsystem_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.tar.gz
system_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.tar.bz2
system_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.zip
Merge "Multi-user external storage support." into jb-mr1-dev
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r--libcutils/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 8684e8fc..9791462e 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -50,7 +50,8 @@ commonSources := \
threads.c \
sched_policy.c \
iosched_policy.c \
- str_parms.c
+ str_parms.c \
+ multiuser.c
commonHostSources := \
ashmem-host.c
@@ -124,8 +125,7 @@ LOCAL_SRC_FILES := $(commonSources) \
mq.c \
partition_utils.c \
qtaguid.c \
- uevent.c \
- multiuser.c
+ uevent.c
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += arch-arm/memset32.S