From 53448c04ae904f7a978f35b4fa0564364413c662 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Mon, 6 Jan 2020 13:27:51 -0800
Subject: gcc-4.9: move binaries to find build breakages

As per:
https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md
We're about to remove gcc-4.9; move the binaries to see if we can spot
any build breakages in pre or post submit testing.

Build cops may revert this change if necessary.

Please report any unexpected build breakages to: android-llvm@googlegroups.com

Bug: 147240075
Change-Id: Id79e32ec398e06b86f8dfbf46f150eb0f40596b2
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
 bin/real-x86_64-linux-android-g++         |  66 ------------------------------
 bin/real-x86_64-linux-android-g++-broken  |  66 ++++++++++++++++++++++++++++++
 bin/real-x86_64-linux-android-gcc         |  66 ------------------------------
 bin/real-x86_64-linux-android-gcc-broken  |  66 ++++++++++++++++++++++++++++++
 bin/x86_64-linux-android-cpp              | Bin 809504 -> 0 bytes
 bin/x86_64-linux-android-cpp-broken       | Bin 0 -> 809504 bytes
 bin/x86_64-linux-android-g++              |  66 ------------------------------
 bin/x86_64-linux-android-g++-broken       |  66 ++++++++++++++++++++++++++++++
 bin/x86_64-linux-android-gcc              |  66 ------------------------------
 bin/x86_64-linux-android-gcc-4.9.x        | Bin 809504 -> 0 bytes
 bin/x86_64-linux-android-gcc-4.9.x-broken | Bin 0 -> 809504 bytes
 bin/x86_64-linux-android-gcc-broken       |  66 ++++++++++++++++++++++++++++++
 12 files changed, 264 insertions(+), 264 deletions(-)
 delete mode 100755 bin/real-x86_64-linux-android-g++
 create mode 100755 bin/real-x86_64-linux-android-g++-broken
 delete mode 100755 bin/real-x86_64-linux-android-gcc
 create mode 100755 bin/real-x86_64-linux-android-gcc-broken
 delete mode 100755 bin/x86_64-linux-android-cpp
 create mode 100755 bin/x86_64-linux-android-cpp-broken
 delete mode 100755 bin/x86_64-linux-android-g++
 create mode 100755 bin/x86_64-linux-android-g++-broken
 delete mode 100755 bin/x86_64-linux-android-gcc
 delete mode 100755 bin/x86_64-linux-android-gcc-4.9.x
 create mode 100755 bin/x86_64-linux-android-gcc-4.9.x-broken
 create mode 100755 bin/x86_64-linux-android-gcc-broken

diff --git a/bin/real-x86_64-linux-android-g++ b/bin/real-x86_64-linux-android-g++
deleted file mode 100755
index 54944a2..0000000
--- a/bin/real-x86_64-linux-android-g++
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-class CompilerWrapper():
-  def __init__(self, argv):
-    self.args = argv
-    self.execargs = []
-    self.real_compiler = None
-    self.argv0 = None
-    self.append_flags = []
-    self.prepend_flags = []
-    self.custom_flags = {
-      '--gomacc-path': None
-    }
-
-  def set_real_compiler(self):
-    """Find the real compiler with the absolute path."""
-    compiler_path = os.path.dirname(os.path.abspath(__file__))
-    if os.path.islink(__file__):
-      compiler = os.path.basename(os.readlink(__file__))
-    else:
-      compiler = os.path.basename(os.path.abspath(__file__))
-    self.real_compiler = os.path.join(
-        compiler_path,
-        "real-" + compiler)
-    self.argv0 = self.real_compiler
-
-  def process_gomacc_command(self):
-    """Return the gomacc command if '--gomacc-path' is set."""
-    gomacc = self.custom_flags['--gomacc-path']
-    if gomacc and os.path.isfile(gomacc):
-      self.argv0 = gomacc
-      self.execargs += [gomacc]
-
-  def parse_custom_flags(self):
-    i = 0
-    args = []
-    while i < len(self.args):
-      if self.args[i] in self.custom_flags:
-        self.custom_flags[self.args[i]] = self.args[i + 1]
-        i = i + 2
-      else:
-        args.append(self.args[i])
-        i = i + 1
-    self.args = args
-
-  def add_flags(self):
-    self.args = self.prepend_flags + self.args + self.append_flags
-
-  def invoke_compiler(self):
-    self.set_real_compiler()
-    self.parse_custom_flags()
-    self.process_gomacc_command()
-    self.add_flags()
-    self.execargs += [self.real_compiler] + self.args
-    os.execv(self.argv0, self.execargs)
-
-
-def main(argv):
-  cw = CompilerWrapper(argv[1:])
-  cw.invoke_compiler()
-
-if __name__ == "__main__":
-  main(sys.argv)
diff --git a/bin/real-x86_64-linux-android-g++-broken b/bin/real-x86_64-linux-android-g++-broken
new file mode 100755
index 0000000..54944a2
--- /dev/null
+++ b/bin/real-x86_64-linux-android-g++-broken
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+import os
+import sys
+
+class CompilerWrapper():
+  def __init__(self, argv):
+    self.args = argv
+    self.execargs = []
+    self.real_compiler = None
+    self.argv0 = None
+    self.append_flags = []
+    self.prepend_flags = []
+    self.custom_flags = {
+      '--gomacc-path': None
+    }
+
+  def set_real_compiler(self):
+    """Find the real compiler with the absolute path."""
+    compiler_path = os.path.dirname(os.path.abspath(__file__))
+    if os.path.islink(__file__):
+      compiler = os.path.basename(os.readlink(__file__))
+    else:
+      compiler = os.path.basename(os.path.abspath(__file__))
+    self.real_compiler = os.path.join(
+        compiler_path,
+        "real-" + compiler)
+    self.argv0 = self.real_compiler
+
+  def process_gomacc_command(self):
+    """Return the gomacc command if '--gomacc-path' is set."""
+    gomacc = self.custom_flags['--gomacc-path']
+    if gomacc and os.path.isfile(gomacc):
+      self.argv0 = gomacc
+      self.execargs += [gomacc]
+
+  def parse_custom_flags(self):
+    i = 0
+    args = []
+    while i < len(self.args):
+      if self.args[i] in self.custom_flags:
+        self.custom_flags[self.args[i]] = self.args[i + 1]
+        i = i + 2
+      else:
+        args.append(self.args[i])
+        i = i + 1
+    self.args = args
+
+  def add_flags(self):
+    self.args = self.prepend_flags + self.args + self.append_flags
+
+  def invoke_compiler(self):
+    self.set_real_compiler()
+    self.parse_custom_flags()
+    self.process_gomacc_command()
+    self.add_flags()
+    self.execargs += [self.real_compiler] + self.args
+    os.execv(self.argv0, self.execargs)
+
+
+def main(argv):
+  cw = CompilerWrapper(argv[1:])
+  cw.invoke_compiler()
+
+if __name__ == "__main__":
+  main(sys.argv)
diff --git a/bin/real-x86_64-linux-android-gcc b/bin/real-x86_64-linux-android-gcc
deleted file mode 100755
index 54944a2..0000000
--- a/bin/real-x86_64-linux-android-gcc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-class CompilerWrapper():
-  def __init__(self, argv):
-    self.args = argv
-    self.execargs = []
-    self.real_compiler = None
-    self.argv0 = None
-    self.append_flags = []
-    self.prepend_flags = []
-    self.custom_flags = {
-      '--gomacc-path': None
-    }
-
-  def set_real_compiler(self):
-    """Find the real compiler with the absolute path."""
-    compiler_path = os.path.dirname(os.path.abspath(__file__))
-    if os.path.islink(__file__):
-      compiler = os.path.basename(os.readlink(__file__))
-    else:
-      compiler = os.path.basename(os.path.abspath(__file__))
-    self.real_compiler = os.path.join(
-        compiler_path,
-        "real-" + compiler)
-    self.argv0 = self.real_compiler
-
-  def process_gomacc_command(self):
-    """Return the gomacc command if '--gomacc-path' is set."""
-    gomacc = self.custom_flags['--gomacc-path']
-    if gomacc and os.path.isfile(gomacc):
-      self.argv0 = gomacc
-      self.execargs += [gomacc]
-
-  def parse_custom_flags(self):
-    i = 0
-    args = []
-    while i < len(self.args):
-      if self.args[i] in self.custom_flags:
-        self.custom_flags[self.args[i]] = self.args[i + 1]
-        i = i + 2
-      else:
-        args.append(self.args[i])
-        i = i + 1
-    self.args = args
-
-  def add_flags(self):
-    self.args = self.prepend_flags + self.args + self.append_flags
-
-  def invoke_compiler(self):
-    self.set_real_compiler()
-    self.parse_custom_flags()
-    self.process_gomacc_command()
-    self.add_flags()
-    self.execargs += [self.real_compiler] + self.args
-    os.execv(self.argv0, self.execargs)
-
-
-def main(argv):
-  cw = CompilerWrapper(argv[1:])
-  cw.invoke_compiler()
-
-if __name__ == "__main__":
-  main(sys.argv)
diff --git a/bin/real-x86_64-linux-android-gcc-broken b/bin/real-x86_64-linux-android-gcc-broken
new file mode 100755
index 0000000..54944a2
--- /dev/null
+++ b/bin/real-x86_64-linux-android-gcc-broken
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+import os
+import sys
+
+class CompilerWrapper():
+  def __init__(self, argv):
+    self.args = argv
+    self.execargs = []
+    self.real_compiler = None
+    self.argv0 = None
+    self.append_flags = []
+    self.prepend_flags = []
+    self.custom_flags = {
+      '--gomacc-path': None
+    }
+
+  def set_real_compiler(self):
+    """Find the real compiler with the absolute path."""
+    compiler_path = os.path.dirname(os.path.abspath(__file__))
+    if os.path.islink(__file__):
+      compiler = os.path.basename(os.readlink(__file__))
+    else:
+      compiler = os.path.basename(os.path.abspath(__file__))
+    self.real_compiler = os.path.join(
+        compiler_path,
+        "real-" + compiler)
+    self.argv0 = self.real_compiler
+
+  def process_gomacc_command(self):
+    """Return the gomacc command if '--gomacc-path' is set."""
+    gomacc = self.custom_flags['--gomacc-path']
+    if gomacc and os.path.isfile(gomacc):
+      self.argv0 = gomacc
+      self.execargs += [gomacc]
+
+  def parse_custom_flags(self):
+    i = 0
+    args = []
+    while i < len(self.args):
+      if self.args[i] in self.custom_flags:
+        self.custom_flags[self.args[i]] = self.args[i + 1]
+        i = i + 2
+      else:
+        args.append(self.args[i])
+        i = i + 1
+    self.args = args
+
+  def add_flags(self):
+    self.args = self.prepend_flags + self.args + self.append_flags
+
+  def invoke_compiler(self):
+    self.set_real_compiler()
+    self.parse_custom_flags()
+    self.process_gomacc_command()
+    self.add_flags()
+    self.execargs += [self.real_compiler] + self.args
+    os.execv(self.argv0, self.execargs)
+
+
+def main(argv):
+  cw = CompilerWrapper(argv[1:])
+  cw.invoke_compiler()
+
+if __name__ == "__main__":
+  main(sys.argv)
diff --git a/bin/x86_64-linux-android-cpp b/bin/x86_64-linux-android-cpp
deleted file mode 100755
index ee31111..0000000
Binary files a/bin/x86_64-linux-android-cpp and /dev/null differ
diff --git a/bin/x86_64-linux-android-cpp-broken b/bin/x86_64-linux-android-cpp-broken
new file mode 100755
index 0000000..ee31111
Binary files /dev/null and b/bin/x86_64-linux-android-cpp-broken differ
diff --git a/bin/x86_64-linux-android-g++ b/bin/x86_64-linux-android-g++
deleted file mode 100755
index 54944a2..0000000
--- a/bin/x86_64-linux-android-g++
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-class CompilerWrapper():
-  def __init__(self, argv):
-    self.args = argv
-    self.execargs = []
-    self.real_compiler = None
-    self.argv0 = None
-    self.append_flags = []
-    self.prepend_flags = []
-    self.custom_flags = {
-      '--gomacc-path': None
-    }
-
-  def set_real_compiler(self):
-    """Find the real compiler with the absolute path."""
-    compiler_path = os.path.dirname(os.path.abspath(__file__))
-    if os.path.islink(__file__):
-      compiler = os.path.basename(os.readlink(__file__))
-    else:
-      compiler = os.path.basename(os.path.abspath(__file__))
-    self.real_compiler = os.path.join(
-        compiler_path,
-        "real-" + compiler)
-    self.argv0 = self.real_compiler
-
-  def process_gomacc_command(self):
-    """Return the gomacc command if '--gomacc-path' is set."""
-    gomacc = self.custom_flags['--gomacc-path']
-    if gomacc and os.path.isfile(gomacc):
-      self.argv0 = gomacc
-      self.execargs += [gomacc]
-
-  def parse_custom_flags(self):
-    i = 0
-    args = []
-    while i < len(self.args):
-      if self.args[i] in self.custom_flags:
-        self.custom_flags[self.args[i]] = self.args[i + 1]
-        i = i + 2
-      else:
-        args.append(self.args[i])
-        i = i + 1
-    self.args = args
-
-  def add_flags(self):
-    self.args = self.prepend_flags + self.args + self.append_flags
-
-  def invoke_compiler(self):
-    self.set_real_compiler()
-    self.parse_custom_flags()
-    self.process_gomacc_command()
-    self.add_flags()
-    self.execargs += [self.real_compiler] + self.args
-    os.execv(self.argv0, self.execargs)
-
-
-def main(argv):
-  cw = CompilerWrapper(argv[1:])
-  cw.invoke_compiler()
-
-if __name__ == "__main__":
-  main(sys.argv)
diff --git a/bin/x86_64-linux-android-g++-broken b/bin/x86_64-linux-android-g++-broken
new file mode 100755
index 0000000..54944a2
--- /dev/null
+++ b/bin/x86_64-linux-android-g++-broken
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+import os
+import sys
+
+class CompilerWrapper():
+  def __init__(self, argv):
+    self.args = argv
+    self.execargs = []
+    self.real_compiler = None
+    self.argv0 = None
+    self.append_flags = []
+    self.prepend_flags = []
+    self.custom_flags = {
+      '--gomacc-path': None
+    }
+
+  def set_real_compiler(self):
+    """Find the real compiler with the absolute path."""
+    compiler_path = os.path.dirname(os.path.abspath(__file__))
+    if os.path.islink(__file__):
+      compiler = os.path.basename(os.readlink(__file__))
+    else:
+      compiler = os.path.basename(os.path.abspath(__file__))
+    self.real_compiler = os.path.join(
+        compiler_path,
+        "real-" + compiler)
+    self.argv0 = self.real_compiler
+
+  def process_gomacc_command(self):
+    """Return the gomacc command if '--gomacc-path' is set."""
+    gomacc = self.custom_flags['--gomacc-path']
+    if gomacc and os.path.isfile(gomacc):
+      self.argv0 = gomacc
+      self.execargs += [gomacc]
+
+  def parse_custom_flags(self):
+    i = 0
+    args = []
+    while i < len(self.args):
+      if self.args[i] in self.custom_flags:
+        self.custom_flags[self.args[i]] = self.args[i + 1]
+        i = i + 2
+      else:
+        args.append(self.args[i])
+        i = i + 1
+    self.args = args
+
+  def add_flags(self):
+    self.args = self.prepend_flags + self.args + self.append_flags
+
+  def invoke_compiler(self):
+    self.set_real_compiler()
+    self.parse_custom_flags()
+    self.process_gomacc_command()
+    self.add_flags()
+    self.execargs += [self.real_compiler] + self.args
+    os.execv(self.argv0, self.execargs)
+
+
+def main(argv):
+  cw = CompilerWrapper(argv[1:])
+  cw.invoke_compiler()
+
+if __name__ == "__main__":
+  main(sys.argv)
diff --git a/bin/x86_64-linux-android-gcc b/bin/x86_64-linux-android-gcc
deleted file mode 100755
index 54944a2..0000000
--- a/bin/x86_64-linux-android-gcc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-class CompilerWrapper():
-  def __init__(self, argv):
-    self.args = argv
-    self.execargs = []
-    self.real_compiler = None
-    self.argv0 = None
-    self.append_flags = []
-    self.prepend_flags = []
-    self.custom_flags = {
-      '--gomacc-path': None
-    }
-
-  def set_real_compiler(self):
-    """Find the real compiler with the absolute path."""
-    compiler_path = os.path.dirname(os.path.abspath(__file__))
-    if os.path.islink(__file__):
-      compiler = os.path.basename(os.readlink(__file__))
-    else:
-      compiler = os.path.basename(os.path.abspath(__file__))
-    self.real_compiler = os.path.join(
-        compiler_path,
-        "real-" + compiler)
-    self.argv0 = self.real_compiler
-
-  def process_gomacc_command(self):
-    """Return the gomacc command if '--gomacc-path' is set."""
-    gomacc = self.custom_flags['--gomacc-path']
-    if gomacc and os.path.isfile(gomacc):
-      self.argv0 = gomacc
-      self.execargs += [gomacc]
-
-  def parse_custom_flags(self):
-    i = 0
-    args = []
-    while i < len(self.args):
-      if self.args[i] in self.custom_flags:
-        self.custom_flags[self.args[i]] = self.args[i + 1]
-        i = i + 2
-      else:
-        args.append(self.args[i])
-        i = i + 1
-    self.args = args
-
-  def add_flags(self):
-    self.args = self.prepend_flags + self.args + self.append_flags
-
-  def invoke_compiler(self):
-    self.set_real_compiler()
-    self.parse_custom_flags()
-    self.process_gomacc_command()
-    self.add_flags()
-    self.execargs += [self.real_compiler] + self.args
-    os.execv(self.argv0, self.execargs)
-
-
-def main(argv):
-  cw = CompilerWrapper(argv[1:])
-  cw.invoke_compiler()
-
-if __name__ == "__main__":
-  main(sys.argv)
diff --git a/bin/x86_64-linux-android-gcc-4.9.x b/bin/x86_64-linux-android-gcc-4.9.x
deleted file mode 100755
index 33e6c27..0000000
Binary files a/bin/x86_64-linux-android-gcc-4.9.x and /dev/null differ
diff --git a/bin/x86_64-linux-android-gcc-4.9.x-broken b/bin/x86_64-linux-android-gcc-4.9.x-broken
new file mode 100755
index 0000000..33e6c27
Binary files /dev/null and b/bin/x86_64-linux-android-gcc-4.9.x-broken differ
diff --git a/bin/x86_64-linux-android-gcc-broken b/bin/x86_64-linux-android-gcc-broken
new file mode 100755
index 0000000..54944a2
--- /dev/null
+++ b/bin/x86_64-linux-android-gcc-broken
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+import os
+import sys
+
+class CompilerWrapper():
+  def __init__(self, argv):
+    self.args = argv
+    self.execargs = []
+    self.real_compiler = None
+    self.argv0 = None
+    self.append_flags = []
+    self.prepend_flags = []
+    self.custom_flags = {
+      '--gomacc-path': None
+    }
+
+  def set_real_compiler(self):
+    """Find the real compiler with the absolute path."""
+    compiler_path = os.path.dirname(os.path.abspath(__file__))
+    if os.path.islink(__file__):
+      compiler = os.path.basename(os.readlink(__file__))
+    else:
+      compiler = os.path.basename(os.path.abspath(__file__))
+    self.real_compiler = os.path.join(
+        compiler_path,
+        "real-" + compiler)
+    self.argv0 = self.real_compiler
+
+  def process_gomacc_command(self):
+    """Return the gomacc command if '--gomacc-path' is set."""
+    gomacc = self.custom_flags['--gomacc-path']
+    if gomacc and os.path.isfile(gomacc):
+      self.argv0 = gomacc
+      self.execargs += [gomacc]
+
+  def parse_custom_flags(self):
+    i = 0
+    args = []
+    while i < len(self.args):
+      if self.args[i] in self.custom_flags:
+        self.custom_flags[self.args[i]] = self.args[i + 1]
+        i = i + 2
+      else:
+        args.append(self.args[i])
+        i = i + 1
+    self.args = args
+
+  def add_flags(self):
+    self.args = self.prepend_flags + self.args + self.append_flags
+
+  def invoke_compiler(self):
+    self.set_real_compiler()
+    self.parse_custom_flags()
+    self.process_gomacc_command()
+    self.add_flags()
+    self.execargs += [self.real_compiler] + self.args
+    os.execv(self.argv0, self.execargs)
+
+
+def main(argv):
+  cw = CompilerWrapper(argv[1:])
+  cw.invoke_compiler()
+
+if __name__ == "__main__":
+  main(sys.argv)
-- 
cgit v1.2.3