Merge remote-tracking branch 'aosp/upstream-master' into mymerge

The version of shflags we have now includes a file with an erroneous
LGPL license header even after the author relicensed under Apache2.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: manual build
Test: treehugger

Change-Id: Ifc31394445d94248473d60b011fa76f66985e0b4

1 files changed, 33 insertions, 0 deletions

diff --git a/.githooks/generic b/.githooks/generic
new file mode 100755
index 0000000..6f903dc
--- /dev/null
+++ b/.githooks/generic
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# A generic git hook proxy.
+# https://git-scm.com/docs/githooks
+
+run() {
+  hook=$1
+  file=$2
+
+  n=$(echo "${file}" |sed "s/^.*${hook}\.//")
+  echo "running ${n} ${hook}"
+  ${file}
+}
+
+die() {
+  hook=$1
+  echo "${hook} hook did not succeed" >&2
+  exit 1
+}
+
+# Redirect output to stderr.
+exec 1>&2
+
+githooks='.githooks'
+basename=$(basename "$0")
+
+for f in $(cd ${githooks} && echo *); do
+  case "${f}" in
+    ${basename}.*)
+      run ${basename} "${githooks}/${f}" || die "${f}"
+      ;;
+  esac
+done