diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 12:20:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-16 12:20:27 +0000 |
| commit | 11a06c73f6e7d31442429a58a346d881b0a8a441 (patch) | |
| tree | f173d0fdc62bd3a889ade436bd65cfbbc5ddd2fa | |
| parent | 83e95878735a62cea108f3c1f1de1358b5565038 (diff) | |
| parent | d2dad2b24fb82604f9dbe7a082e630a524f1473d (diff) | |
| download | bionic-11a06c73f6e7d31442429a58a346d881b0a8a441.zip bionic-11a06c73f6e7d31442429a58a346d881b0a8a441.tar.gz bionic-11a06c73f6e7d31442429a58a346d881b0a8a441.tar.bz2 | |
Merge "Revert "Moving StringPrintf to libbase.""
| -rw-r--r-- | benchmarks/Android.mk | 8 | ||||
| -rw-r--r-- | benchmarks/Benchmark.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index e1580fe..ae0541f 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 := libbase +LOCAL_STATIC_LIBRARIES := libutils 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 := libbase +LOCAL_STATIC_LIBRARIES := libutils 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 libbase +LOCAL_STATIC_LIBRARIES := libbenchmark libutils 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 libbase +LOCAL_STATIC_LIBRARIES := libbenchmark libutils include $(BUILD_HOST_EXECUTABLE) endif diff --git a/benchmarks/Benchmark.cpp b/benchmarks/Benchmark.cpp index ea6000f..5ca1d47 100644 --- a/benchmarks/Benchmark.cpp +++ b/benchmarks/Benchmark.cpp @@ -24,7 +24,7 @@ #include <string> #include <vector> -#include <base/stringprintf.h> +#include <utils/stringprintf.h> #include <benchmark/Benchmark.h> @@ -108,7 +108,7 @@ std::string BenchmarkWithArg<int>::GetNameStr(int arg) { template <> std::string BenchmarkWithArg<double>::GetNameStr(double arg) { - return Name() + "/" + android::base::StringPrintf("%0.6f", arg); + return Name() + "/" + android::StringPrintf("%0.6f", arg); } template<typename T> |