Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Exempt-From-Owner-Approval: conflict with upstream OWNERS file
Change-Id: If78be01dab78071483b16a301e1ee29a57d7106c
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4478fdf
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,51 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library_static {
+ name: "libgoogle-benchmark",
+ host_supported: true,
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+ local_include_dirs: ["include"],
+ cflags: [
+ "-DBENCHMARK_ANDROID",
+ "-DHAVE_POSIX_REGEX",
+ "-Werror",
+ ],
+
+ srcs: [
+ "src/benchmark.cc",
+ "src/benchmark_register.cc",
+ "src/colorprint.cc",
+ "src/commandlineflags.cc",
+ "src/complexity.cc",
+ "src/console_reporter.cc",
+ "src/counter.cc",
+ "src/csv_reporter.cc",
+ "src/json_reporter.cc",
+ "src/reporter.cc",
+ "src/sleep.cc",
+ "src/statistics.cc",
+ "src/string_util.cc",
+ "src/sysinfo.cc",
+ "src/timers.cc",
+ ],
+ export_include_dirs: ["include"],
+}
+
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..05eaa31
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+dominic@google.com
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..ab86d09
--- /dev/null
+++ b/README.version
@@ -0,0 +1,4 @@
+URL: https://github.com/google/benchmark
+Version: 8da907c2c2786685c7da9f4759de052e3990f6f1
+BugComponent: 119451
+Owners: enh, android-bionic
