diff options
| author | Elliott Hughes <enh@google.com> | 2016-07-15 11:11:52 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-07-15 13:15:35 -0700 |
| commit | 01950b6483ba3d71ecff360d11ed83abaea42187 (patch) | |
| tree | 7bf4634a4e8722e41f0af1bedcfde6072c3c23f9 /Android.bp | |
| parent | 8ed91fc48466f2c7453b443366a84a99d167653c (diff) | |
| parent | ebd37b191c757cd0b20c9c8517e38d1e1ac45069 (diff) | |
| download | google-benchmark-01950b6483ba3d71ecff360d11ed83abaea42187.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Change-Id: Ia5f19a6596d9fe486035cd8a14eec70dc38cd068
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -32,6 +32,7 @@ cc_library_static { "src/benchmark.cc", "src/colorprint.cc", "src/commandlineflags.cc", + "src/complexity.cc", "src/console_reporter.cc", "src/csv_reporter.cc", "src/json_reporter.cc", |