commit b0d0e260bd6118959fa0e2d3c84037b3e0178551
author Nick Kralevich <nnk@google.com> Wed Apr 27 13:09:24 2011 -0700
committer Nick Kralevich <nnk@google.com> Wed Apr 27 13:09:24 2011 -0700
tree 1f1ba33b53e8d0608f6d034f767a90c41eaf3fef
parent 66acffad765add93c8fc74592725eec901867393
parent 2baeb89882259661e17d7f631ae7f8987cf53c46

resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9

libcutils/Android.mk

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 @@
 # ========================================================
 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