diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:44:45 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:44:45 +0100 |
| commit | 59d89eaa4ca8ad49ca28d40a72ba4dd229ed6d5c (patch) | |
| tree | d489027db48e27e354aa8cee9036b96f5a4a7594 | |
| parent | dbcd8668ad59d5c59a21c6835926b471ea133255 (diff) | |
| parent | b2b95168dce5a0330ffb5ae962db49b1697e92f7 (diff) | |
| download | android_hardware_ti_wpan-59d89eaa4ca8ad49ca28d40a72ba4dd229ed6d5c.tar.gz android_hardware_ti_wpan-59d89eaa4ca8ad49ca28d40a72ba4dd229ed6d5c.tar.bz2 android_hardware_ti_wpan-59d89eaa4ca8ad49ca28d40a72ba4dd229ed6d5c.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.0cm-10.2-M1
Android 4.3 release 2.1
Conflicts:
bluedroid_wilink/Android.mk
bluedroid_wilink/libbt-vendor-ti.c
Change-Id: Ib0fa494c179386d778e46ed988f6055f3e5ee1e7
| -rw-r--r-- | ti_st/uim-sysfs/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ti_st/uim-sysfs/Android.mk b/ti_st/uim-sysfs/Android.mk index e1cfd31..c57dd11 100644 --- a/ti_st/uim-sysfs/Android.mk +++ b/ti_st/uim-sysfs/Android.mk @@ -12,7 +12,7 @@ LOCAL_C_INCLUDES:= uim.h LOCAL_SRC_FILES:= \ uim.c LOCAL_CFLAGS:= -g -c -W -Wall -O2 -D_POSIX_SOURCE -LOCAL_SHARED_LIBRARIES:= libnetutils libcutils +LOCAL_SHARED_LIBRARIES:= libnetutils libcutils liblog LOCAL_MODULE:=uim-sysfs LOCAL_MODULE_TAGS:= eng include $(BUILD_EXECUTABLE) |