diff options
| author | Nick Kralevich <nnk@google.com> | 2011-04-27 13:09:24 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2011-04-27 13:09:24 -0700 |
| commit | b0d0e260bd6118959fa0e2d3c84037b3e0178551 (patch) | |
| tree | 1f1ba33b53e8d0608f6d034f767a90c41eaf3fef /libcutils/Android.mk | |
| parent | 66acffad765add93c8fc74592725eec901867393 (diff) | |
| parent | 2baeb89882259661e17d7f631ae7f8987cf53c46 (diff) | |
| download | system_core-b0d0e260bd6118959fa0e2d3c84037b3e0178551.zip system_core-b0d0e260bd6118959fa0e2d3c84037b3e0178551.tar.gz system_core-b0d0e260bd6118959fa0e2d3c84037b3e0178551.tar.bz2 | |
resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp
Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index b6c5382..25d36da 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -109,7 +109,7 @@ else #!sim # ======================================================== include $(CLEAR_VARS) LOCAL_MODULE := libcutils -LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c android_reboot.c +LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c android_reboot.c uevent.c ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES += arch-arm/memset32.S |