diff options
| author | Nick Kralevich <nnk@google.com> | 2011-04-27 13:49:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-27 13:49:59 -0700 |
| commit | 4682abaaa6f714d7bcfcf861af77b1b3c3c64281 (patch) | |
| tree | 303b6f90d52df7435ac6f629772d83dbb26ace56 /libcutils/Android.mk | |
| parent | ee07501b25e088b24f87b691bf14756a94d2941e (diff) | |
| parent | b0d0e260bd6118959fa0e2d3c84037b3e0178551 (diff) | |
| download | system_core-4682abaaa6f714d7bcfcf861af77b1b3c3c64281.tar.gz system_core-4682abaaa6f714d7bcfcf861af77b1b3c3c64281.tar.bz2 system_core-4682abaaa6f714d7bcfcf861af77b1b3c3c64281.zip | |
am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp
* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
Fold uevent message origin checking from init into libcutils.
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 b6c53821..25d36daa 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 |