diff options
| author | Martijn Coenen <maco@google.com> | 2016-11-15 09:09:30 +0100 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-11-15 14:14:13 +0100 |
| commit | ac64db9550713bd81fd50fc8d289ffa8a9c1270c (patch) | |
| tree | 522f777b0dee03f95beb844c44d4acfcb9e52dc2 /Android.bp | |
| parent | db1632fadc79df388a2a7248157c965ee40248a1 (diff) | |
| parent | 4f8bfeae470950ef005327973f15b0044eceaceb (diff) | |
| download | google-benchmark-ac64db9550713bd81fd50fc8d289ffa8a9c1270c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into upstream_merge
Test: builds, ran bionic benchmark (b/32895959 for discrepancies)
Change-Id: I2adb0a3c84d469e4f1aeb6b411b18a37f5782d98
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -30,19 +30,18 @@ cc_library_static { srcs: [ "src/benchmark.cc", + "src/benchmark_register.cc", "src/colorprint.cc", "src/commandlineflags.cc", "src/complexity.cc", "src/console_reporter.cc", "src/csv_reporter.cc", "src/json_reporter.cc", - "src/log.cc", "src/reporter.cc", - "src/re_posix.cc", "src/sleep.cc", "src/string_util.cc", "src/sysinfo.cc", - "src/walltime.cc", + "src/timers.cc", ], export_include_dirs: ["include"], } |