diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index ae0541f12..e1580feb4 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -42,7 +42,7 @@ LOCAL_CFLAGS := $(benchmark_cflags) LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_SRC_FILES := $(benchmarklib_src_files) LOCAL_C_INCLUDES := $(benchmark_c_includes) -LOCAL_STATIC_LIBRARIES := libutils +LOCAL_STATIC_LIBRARIES := libbase include $(BUILD_STATIC_LIBRARY) # Only supported on linux systems. @@ -55,7 +55,7 @@ LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_SRC_FILES := $(benchmarklib_src_files) LOCAL_C_INCLUDES := $(benchmark_c_includes) LOCAL_MULTILIB := both -LOCAL_STATIC_LIBRARIES := libutils +LOCAL_STATIC_LIBRARIES := libbase include $(BUILD_HOST_STATIC_LIBRARY) endif @@ -84,7 +84,7 @@ LOCAL_MULTILIB := both LOCAL_CFLAGS := $(benchmark_cflags) LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_SRC_FILES := $(benchmark_src_files) -LOCAL_STATIC_LIBRARIES := libbenchmark libutils +LOCAL_STATIC_LIBRARIES := libbenchmark libbase include $(BUILD_EXECUTABLE) # We don't build a static benchmark executable because it's not usually @@ -106,7 +106,7 @@ LOCAL_CFLAGS := $(benchmark_cflags) LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_LDFLAGS := -lrt LOCAL_SRC_FILES := $(benchmark_src_files) -LOCAL_STATIC_LIBRARIES := libbenchmark libutils +LOCAL_STATIC_LIBRARIES := libbenchmark libbase include $(BUILD_HOST_EXECUTABLE) endif diff --git a/benchmarks/Benchmark.cpp b/benchmarks/Benchmark.cpp index 5ca1d4792..ea6000fe5 100644 --- a/benchmarks/Benchmark.cpp +++ b/benchmarks/Benchmark.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -108,7 +108,7 @@ std::string BenchmarkWithArg::GetNameStr(int arg) { template <> std::string BenchmarkWithArg::GetNameStr(double arg) { - return Name() + "/" + android::StringPrintf("%0.6f", arg); + return Name() + "/" + android::base::StringPrintf("%0.6f", arg); } template