diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 19:39:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 19:39:49 +0000 |
| commit | c0daa7771eeaa9608c623794d90b8e81463ef857 (patch) | |
| tree | 0fe0f368a72cf45cae5776a0ca90c90cc693ced5 | |
| parent | 1c380ee55837e39407658092fff5ad7afab871db (diff) | |
| parent | 83f02f244225e601132ebcbc9e3886e80eb4d613 (diff) | |
| download | extras-l-preview.tar.gz | |
Merge "Don't manually link stlport."android-l-preview_r2l-preview
| -rw-r--r-- | memtrack/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/memtrack/Android.mk b/memtrack/Android.mk index 22472ca3..0054c708 100644 --- a/memtrack/Android.mk +++ b/memtrack/Android.mk @@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(includes) LOCAL_SHARED_LIBRARIES := \ liblog \ -include external/stlport/libstlport.mk +LOCAL_CXX_STL := stlport include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -45,8 +45,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_STATIC_LIBRARIES := \ libc \ libstdc++ \ - libstlport_static \ liblog \ -include external/stlport/libstlport.mk +LOCAL_CXX_STL := stlport_static include $(BUILD_EXECUTABLE) |