summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-04-10 05:21:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-10 05:21:19 +0000
commit027f41e53396c19c9b7572c49b7663c2e268c9af (patch)
treeeba968150ef1d3709671b546025375649efbea1d
parent595ab7e9788f61125fa14d1ff2768f995ac7b7e7 (diff)
parentdb5b42148d9d1f59a1e22cf716131dcfd71ead12 (diff)
downloadandroid_packages_apps_Nfc-027f41e53396c19c9b7572c49b7663c2e268c9af.tar.gz
android_packages_apps_Nfc-027f41e53396c19c9b7572c49b7663c2e268c9af.tar.bz2
android_packages_apps_Nfc-027f41e53396c19c9b7572c49b7663c2e268c9af.zip
Merge "Add liblog" into jb-mr2-dev
-rw-r--r--nci/jni/Android.mk1
-rw-r--r--nxp/jni/Android.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk
index d2f718b9..c84ca1a5 100644
--- a/nci/jni/Android.mk
+++ b/nci/jni/Android.mk
@@ -45,6 +45,7 @@ LOCAL_SHARED_LIBRARIES := \
libnativehelper \
libcutils \
libutils \
+ liblog \
libnfc-nci \
libstlport
diff --git a/nxp/jni/Android.mk b/nxp/jni/Android.mk
index 8b737096..53d17daa 100644
--- a/nxp/jni/Android.mk
+++ b/nxp/jni/Android.mk
@@ -25,6 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
libnativehelper \
libcutils \
libutils \
+ liblog \
libnfc \
libhardware