diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-07 18:13:08 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-08-08 10:30:43 -0700 |
| commit | 3c47e69e330d6d2890afae3b0b447954fbb97911 (patch) | |
| tree | a20e58ab972d37bc9178a421fd1c3b67ba011b6a /nci/jni | |
| parent | 8d6ea79dad7c25f592722faf47709e1b918d4c21 (diff) | |
| download | packages_apps_nfc-3c47e69e330d6d2890afae3b0b447954fbb97911.zip packages_apps_nfc-3c47e69e330d6d2890afae3b0b447954fbb97911.tar.gz packages_apps_nfc-3c47e69e330d6d2890afae3b0b447954fbb97911.tar.bz2 | |
Fix one last user of astl to use stlport instead...
This wasn't directly referencing libastl, so I didn't find it first
time round. A top level rebuild without external/astl caught it. I've
since grepped and there are no other projects that pull in the include
files without the shared library.
Change-Id: I2dd06727098744076a7e115d05a8139029ff977a
Diffstat (limited to 'nci/jni')
| -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 |