Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kevin
bionic
Commits
11a06c73
Commit
11a06c73
authored
10 years ago
by
Nicolas Geoffray
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Revert "Moving StringPrintf to libbase.""
parents
83e95878
d2dad2b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
benchmarks/Android.mk
benchmarks/Android.mk
+4
-4
benchmarks/Benchmark.cpp
benchmarks/Benchmark.cpp
+2
-2
No files found.
benchmarks/Android.mk
View file @
11a06c73
...
...
@@ -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
:=
lib
base
LOCAL_STATIC_LIBRARIES
:=
lib
utils
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
:=
lib
base
LOCAL_STATIC_LIBRARIES
:=
lib
utils
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 lib
base
LOCAL_STATIC_LIBRARIES
:=
libbenchmark lib
utils
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 lib
base
LOCAL_STATIC_LIBRARIES
:=
libbenchmark lib
utils
include
$(BUILD_HOST_EXECUTABLE)
endif
...
...
This diff is collapsed.
Click to expand it.
benchmarks/Benchmark.cpp
View file @
11a06c73
...
...
@@ -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
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment