diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-15 18:50:10 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-15 18:50:10 -0800 |
| commit | dc847e65b80fc2dd00f2b70b2443e1a0df042cd6 (patch) | |
| tree | eafe42c157478d3cfb481fd5949b6befd35c687e /memtrack | |
| parent | 122ca1918351648d0bc252a5583d376f8b3a0ee7 (diff) | |
| download | extras-dc847e65b80fc2dd00f2b70b2443e1a0df042cd6.tar.gz | |
Move system/extras to libc++.
Bug: 15193147
Change-Id: I2188179aa315b6b94493135cfb243d5a9018fd10
Diffstat (limited to 'memtrack')
| -rw-r--r-- | memtrack/Android.mk | 14 | ||||
| -rw-r--r-- | memtrack/memtrack.cpp | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/memtrack/Android.mk b/memtrack/Android.mk index 0054c708..be2eeee1 100644 --- a/memtrack/Android.mk +++ b/memtrack/Android.mk @@ -15,7 +15,7 @@ LOCAL_PATH:= $(call my-dir) src_files := \ - memtrack.cpp + memtrack.cpp include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -28,9 +28,8 @@ LOCAL_MODULE := memtrack_share LOCAL_C_INCLUDES += $(includes) LOCAL_SHARED_LIBRARIES := \ - liblog \ + liblog \ -LOCAL_CXX_STL := stlport include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -43,9 +42,10 @@ LOCAL_MODULE := memtrack LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_STATIC_LIBRARIES := \ - libc \ - libstdc++ \ - liblog \ + libc \ + liblog \ + libc++abi \ + libdl \ -LOCAL_CXX_STL := stlport_static +LOCAL_CXX_STL := libc++_static include $(BUILD_EXECUTABLE) diff --git a/memtrack/memtrack.cpp b/memtrack/memtrack.cpp index ab45fd0c..a451d5c0 100644 --- a/memtrack/memtrack.cpp +++ b/memtrack/memtrack.cpp @@ -14,24 +14,24 @@ * limitations under the License. */ -#include <stdio.h> -#include <limits.h> -#include <ctype.h> -#include <unistd.h> +#include "memtrack.h" +#include <ctype.h> +#include <dirent.h> +#include <fcntl.h> +#include <limits.h> #include <signal.h> -#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> #include <sys/stat.h> -#include <fcntl.h> -#include <dirent.h> +#include <sys/types.h> +#include <unistd.h> #include <cutils/log.h> #include <algorithm> #include <vector> -#include "memtrack.h" - #ifdef LOG_TAG #undef LOG_TAG #endif |