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 /tests | |
parent | 122ca1918351648d0bc252a5583d376f8b3a0ee7 (diff) | |
download | extras-dc847e65b80fc2dd00f2b70b2443e1a0df042cd6.tar.gz |
Move system/extras to libc++.
Bug: 15193147
Change-Id: I2188179aa315b6b94493135cfb243d5a9018fd10
Diffstat (limited to 'tests')
-rw-r--r-- | tests/binder/benchmarks/Android.mk | 1 | ||||
-rw-r--r-- | tests/memtest/Android.mk | 1 | ||||
-rw-r--r-- | tests/memtest/bandwidth.cpp | 8 | ||||
-rw-r--r-- | tests/memtest/bandwidth.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk index c0ddb47b..eb2ead26 100644 --- a/tests/binder/benchmarks/Android.mk +++ b/tests/binder/benchmarks/Android.mk @@ -37,5 +37,4 @@ LOCAL_C_INCLUDES += \ 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 94476ceb..771a22ea 100644 --- a/tests/memtest/Android.mk +++ b/tests/memtest/Android.mk @@ -14,6 +14,5 @@ LOCAL_MODULE:= memtest 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 cf406e6c..7dab4ba0 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 a09d082d..e4a5c96e 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. |