Merge "Move liblog tests and benchmarks to libc++."

2014-11-12 03:44:41 +00:00 · 2014-11-12 03:44:41 +00:00 · 5c7e2e6030
parent 7d196df6f9 f2dedb7a5f
commit 5c7e2e6030
2 changed files with 1 additions and 1 deletions
--- 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)

 # -----------------------------------------------------------------------------
--- 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>