Merge remote-tracking branch 'upstream/sdk-1.3.231' into master
Bug: 112606
Change-Id: Ibc6d4575e5696569f4ec9164a6393e35b3fda902
diff --git a/BUILD.gn b/BUILD.gn
index b7e20b3..fd22648 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -259,6 +259,11 @@
changes_file = "CHANGES"
inc_file = "${target_gen_dir}/build-version.inc"
+ inputs = [
+ "CHANGES",
+ ".git/HEAD",
+ ]
+
outputs = [ inc_file ]
args = [
rebase_path(changes_file, root_build_dir),
@@ -360,6 +365,8 @@
"-Wno-newline-eof",
"-Wno-unreachable-code-break",
"-Wno-unreachable-code-return",
+ "-Wno-unused-but-set-variable",
+ "-Wno-deprecated-copy",
]
} else if (!is_win) {
# Work around a false-positive on a Skia GCC 10 builder.
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..b5ae8b9
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+cfontas@google.com
+cstout@google.com
+jbauman@google.com
+jjosh@google.com
+liyl@google.com
+rosasco@google.com
