diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 16:36:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 16:36:52 +0000 |
| commit | ff0079fc8fdd60f818113459483b5983a2cd8ba3 (patch) | |
| tree | 82128e6dec5dac888edda68943f189e65e024d8c | |
| parent | e924cced8e816dc655833d49b61a627814c57645 (diff) | |
| parent | 4e4729668617ff1b45f88b15d8cbfecc3c0a1db2 (diff) | |
| download | system_core-ff0079fc8fdd60f818113459483b5983a2cd8ba3.zip system_core-ff0079fc8fdd60f818113459483b5983a2cd8ba3.tar.gz system_core-ff0079fc8fdd60f818113459483b5983a2cd8ba3.tar.bz2 | |
am 4e472966: am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."
* commit '4e4729668617ff1b45f88b15d8cbfecc3c0a1db2':
Move liblog tests and benchmarks to libc++.
| -rw-r--r-- | liblog/tests/Android.mk | 1 | ||||
| -rw-r--r-- | liblog/tests/benchmark_main.cpp | 1 |
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> |