Revert "Moving StringPrintf to libbase."
libbase has been reverted
This reverts commit 7ed5fa1e4d37722a644518594bf2b0e1529c05e9.
Change-Id: I5d8ff8c38ff8c9123e6cee5dc15a101a79e94b2e
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_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_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_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_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 ea6000fe..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 @@
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>
