diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:19:50 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:19:50 -0800 |
| commit | 39d33d8d54ba55e49f9b430f842647a84751cb85 (patch) | |
| tree | f5a3756ea25d3b87902ae6a6a8df2428509e4246 /libcutils/Android.mk | |
| parent | d8aa8ab7424be375e4408ab360c000ac8b05d15d (diff) | |
| parent | 31da9db0d1bf3227e3c383aa6ac28bde3c6409e5 (diff) | |
| download | system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.tar.gz system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.tar.bz2 system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/core into mr1
Conflicts:
adb/Android.mk
adb/usb_vendors.c
include/private/android_filesystem_config.h
include/system/audio.h
include/system/camera.h
init/property_service.c
libnetutils/ifc_utils.c
mkbootimg/mkbootimg.c
rootdir/init.rc
Change-Id: Ie42f0c14808e9f8cabd24854bfe15b6667955229
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 6a2ba663..3051baf7 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -50,7 +50,7 @@ commonSources := \ threads.c \ sched_policy.c \ iosched_policy.c \ - str_parms.c + str_parms.c \ commonHostSources := \ ashmem-host.c @@ -75,9 +75,10 @@ ifeq ($(WINDOWS_HOST_ONLY),1) else commonSources += \ abort_socket.c \ - mspace.c \ + fs.c \ selector.c \ tztime.c \ + multiuser.c \ zygote.c commonHostSources += \ @@ -129,16 +130,12 @@ LOCAL_SRC_FILES := $(commonSources) \ ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES += arch-arm/memset32.S else # !arm -ifeq ($(TARGET_ARCH),sh) -LOCAL_SRC_FILES += memory.c atomic-android-sh.c -else # !sh ifeq ($(TARGET_ARCH_VARIANT),x86-atom) LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c else # !x86-atom LOCAL_SRC_FILES += memory.c endif # !x86-atom -endif # !sh endif # !arm ifneq ($(TARGET_RECOVERY_PRE_COMMAND),) |