Move system/extras to libc++.
Bug: 15193147
Change-Id: I2188179aa315b6b94493135cfb243d5a9018fd10
diff --git a/memtrack/Android.mk b/memtrack/Android.mk
index 0054c70..be2eeee 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_C_INCLUDES += $(includes)
LOCAL_SHARED_LIBRARIES := \
- liblog \
+ liblog \
-LOCAL_CXX_STL := stlport
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
@@ -43,9 +42,10 @@
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 ab45fd0..a451d5c 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 <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <ctype.h>
#include <dirent.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.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
diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk
index c0ddb47..eb2ead2 100644
--- a/tests/binder/benchmarks/Android.mk
+++ b/tests/binder/benchmarks/Android.mk
@@ -37,5 +37,4 @@
LOCAL_MODULE := binderAddInts
LOCAL_SRC_FILES := binderAddInts.cpp
-include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index 94476ce..771a22e 100644
--- a/tests/memtest/Android.mk
+++ b/tests/memtest/Android.mk
@@ -14,6 +14,5 @@
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -fomit-frame-pointer
-include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
endif
diff --git a/tests/memtest/bandwidth.cpp b/tests/memtest/bandwidth.cpp
index cf406e6..7dab4ba 100644
--- a/tests/memtest/bandwidth.cpp
+++ b/tests/memtest/bandwidth.cpp
@@ -14,18 +14,18 @@
* limitations under the License.
*/
+#include "bandwidth.h"
+
+#include <ctype.h>
#include <pthread.h>
#include <sched.h>
-#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/time.h>
#include <unistd.h>
-#include <ctype.h>
#include <map>
#include <vector>
-#include "bandwidth.h"
-
typedef struct {
const char *name;
diff --git a/tests/memtest/bandwidth.h b/tests/memtest/bandwidth.h
index a09d082..e4a5c96 100644
--- a/tests/memtest/bandwidth.h
+++ b/tests/memtest/bandwidth.h
@@ -17,6 +17,8 @@
#ifndef __BANDWIDTH_H__
#define __BANDWIDTH_H__
+#include <stdlib.h>
+
#include "memtest.h"
// Bandwidth Class definitions.