diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-08 10:36:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 10:36:04 -0700 |
| commit | 813d6cd48f4699f79acd873533dbcdce2fa0b2be (patch) | |
| tree | 190b7cf3d4faafca4b77ac8be3d481dc252dab19 | |
| parent | a81a90813f9282a708733cecdd2968d874ea1c1d (diff) | |
| parent | 3c47e69e330d6d2890afae3b0b447954fbb97911 (diff) | |
| download | packages_apps_nfc-813d6cd48f4699f79acd873533dbcdce2fa0b2be.zip packages_apps_nfc-813d6cd48f4699f79acd873533dbcdce2fa0b2be.tar.gz packages_apps_nfc-813d6cd48f4699f79acd873533dbcdce2fa0b2be.tar.bz2 | |
am 3c47e69e: Fix one last user of astl to use stlport instead...
* commit '3c47e69e330d6d2890afae3b0b447954fbb97911':
Fix one last user of astl to use stlport instead...
| -rw-r--r-- | nci/jni/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk index a1fb83e..cdcd34e 100644 --- a/nci/jni/Android.mk +++ b/nci/jni/Android.mk @@ -20,7 +20,9 @@ endef LOCAL_SRC_FILES:= $(call all-cpp-files-under, .) LOCAL_C_INCLUDES += \ - external/astl/include \ + bionic \ + bionic/libstdc++ \ + external/stlport/stlport \ external/libxml2/include \ external/icu4c/common \ $(NFA)/include \ @@ -37,7 +39,8 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libcutils \ libutils \ - libnfc-nci + libnfc-nci \ + libstlport LOCAL_STATIC_LIBRARIES := libxml2 |