commit 4e4729668617ff1b45f88b15d8cbfecc3c0a1db2
author Dan Albert <danalbert@google.com> Wed Nov 12 03:54:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 12 03:54:34 2014 +0000
tree 4ee313a4fa7ba185414950e98915cfa24c0b72e4
parent 498c8135b46b976806fb4e335071c11fc2c51776
parent 5c7e2e603079c611b99302e5898b443440f2d9d7

am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."

* commit '5c7e2e603079c611b99302e5898b443440f2d9d7':
  Move liblog tests and benchmarks to libc++.

liblog/tests/Android.mk

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

liblog/tests/benchmark_main.cpp

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>