pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving StringPrintf to libbase. 

Change-Id: I47ef28bb294ffb7c7c065c5624417edf23503b77
This commit is contained in:
Dan Albert 2015-03-13 22:34:37 -07:00
parent f6f96df5b0
commit 7ed5fa1e4d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
benchmarks/Android.mk
View File

@ -42,7 +42,7 @@ LOCAL_CFLAGS := $(benchmark_cflags)
LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_CPPFLAGS := $(benchmark_cppflags)
LOCAL_SRC_FILES := $(benchmarklib_src_files) LOCAL_SRC_FILES := $(benchmarklib_src_files)
LOCAL_C_INCLUDES := $(benchmark_c_includes) LOCAL_C_INCLUDES := $(benchmark_c_includes)
LOCAL_STATIC_LIBRARIES := libutils LOCAL_STATIC_LIBRARIES := libbase
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# Only supported on linux systems. # Only supported on linux systems.
@ -55,7 +55,7 @@ LOCAL_CPPFLAGS := $(benchmark_cppflags)
LOCAL_SRC_FILES := $(benchmarklib_src_files) LOCAL_SRC_FILES := $(benchmarklib_src_files)
LOCAL_C_INCLUDES := $(benchmark_c_includes) LOCAL_C_INCLUDES := $(benchmark_c_includes)
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_STATIC_LIBRARIES := libutils LOCAL_STATIC_LIBRARIES := libbase
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
endif endif
@ -84,7 +84,7 @@ LOCAL_MULTILIB := both
LOCAL_CFLAGS := $(benchmark_cflags) LOCAL_CFLAGS := $(benchmark_cflags)
LOCAL_CPPFLAGS := $(benchmark_cppflags) LOCAL_CPPFLAGS := $(benchmark_cppflags)
LOCAL_SRC_FILES := $(benchmark_src_files) LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_STATIC_LIBRARIES := libbenchmark libutils LOCAL_STATIC_LIBRARIES := libbenchmark libbase
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# We don't build a static benchmark executable because it's not usually # 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_CPPFLAGS := $(benchmark_cppflags)
LOCAL_LDFLAGS := -lrt LOCAL_LDFLAGS := -lrt
LOCAL_SRC_FILES := $(benchmark_src_files) LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_STATIC_LIBRARIES := libbenchmark libutils LOCAL_STATIC_LIBRARIES := libbenchmark libbase
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif endif

4
benchmarks/Benchmark.cpp
View File

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <utils/stringprintf.h> #include <base/stringprintf.h>
#include <benchmark/Benchmark.h> #include <benchmark/Benchmark.h>
@ -108,7 +108,7 @@ std::string BenchmarkWithArg<int>::GetNameStr(int arg) {
template <> template <>
std::string BenchmarkWithArg<double>::GetNameStr(double arg) { std::string BenchmarkWithArg<double>::GetNameStr(double arg) {
return Name() + "/" + android::StringPrintf("%0.6f", arg); return Name() + "/" + android::base::StringPrintf("%0.6f", arg);
} }
template<typename T> template<typename T>