summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-11 19:35:29 -0800
committerDan Albert <danalbert@google.com>2014-11-12 03:44:16 +0000
commitf2dedb7a5f07dc5e0b814c82739aeb0097cf86fa (patch)
tree73c0f1c6a29719c2ed0bd54d5017e6905f70db4c /liblog
parent2c0839e9dba6d9d282f8391c3edb14236f56618d (diff)
downloadsystem_core-f2dedb7a5f07dc5e0b814c82739aeb0097cf86fa.zip
system_core-f2dedb7a5f07dc5e0b814c82739aeb0097cf86fa.tar.gz
system_core-f2dedb7a5f07dc5e0b814c82739aeb0097cf86fa.tar.bz2
Move liblog tests and benchmarks to libc++.
Bug: 15193147 Change-Id: Ib063eb9490e40f9d10c0b0f29b7808c729e4fff9
Diffstat (limited to 'liblog')
-rw-r--r--liblog/tests/Android.mk1
-rw-r--r--liblog/tests/benchmark_main.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk
index b1426d3..172b186 100644
--- a/liblog/tests/Android.mk
+++ b/liblog/tests/Android.mk
@@ -44,7 +44,6 @@ LOCAL_CFLAGS += $(benchmark_c_flags)
LOCAL_SHARED_LIBRARIES += liblog libm
LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
-include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
# -----------------------------------------------------------------------------
diff --git a/liblog/tests/benchmark_main.cpp b/liblog/tests/benchmark_main.cpp
index 090394c..e5ef970 100644
--- a/liblog/tests/benchmark_main.cpp
+++ b/liblog/tests/benchmark_main.cpp
@@ -17,6 +17,7 @@
#include <benchmark.h>
#include <inttypes.h>
+#include <math.h>
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>