From 25c216f84182d09c76c29069ab70a96388e731af Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 6 Jan 2020 13:31:16 -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: I9574505c60ccdf77d0b35ad6a03fd745ca9d7b86 Signed-off-by: Nick Desaulniers --- bin/40337694-a816-11e9-ad6c-9bcb01b061bd | Bin 784928 -> 0 bytes bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken | Bin 0 -> 784928 bytes bin/561b170a-a816-11e9-b283-6b5a5e00ead0 | Bin 789024 -> 0 bytes bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken | Bin 0 -> 789024 bytes bin/arm-linux-androideabi-g++ | 77 ------------------------ bin/arm-linux-androideabi-g++-broken | 77 ++++++++++++++++++++++++ bin/arm-linux-androideabi-gcc | 77 ------------------------ bin/arm-linux-androideabi-gcc-4.9.x | Bin 784928 -> 0 bytes bin/arm-linux-androideabi-gcc-4.9.x-broken | Bin 0 -> 784928 bytes bin/arm-linux-androideabi-gcc-broken | 77 ++++++++++++++++++++++++ 10 files changed, 154 insertions(+), 154 deletions(-) delete mode 100755 bin/40337694-a816-11e9-ad6c-9bcb01b061bd create mode 100755 bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken delete mode 100755 bin/561b170a-a816-11e9-b283-6b5a5e00ead0 create mode 100755 bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken delete mode 100755 bin/arm-linux-androideabi-g++ create mode 100755 bin/arm-linux-androideabi-g++-broken delete mode 100755 bin/arm-linux-androideabi-gcc delete mode 100755 bin/arm-linux-androideabi-gcc-4.9.x create mode 100755 bin/arm-linux-androideabi-gcc-4.9.x-broken create mode 100755 bin/arm-linux-androideabi-gcc-broken diff --git a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd deleted file mode 100755 index 0bfbd65..0000000 Binary files a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd and /dev/null differ diff --git a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken new file mode 100755 index 0000000..0bfbd65 Binary files /dev/null and b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken differ diff --git a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 deleted file mode 100755 index 5c275a7..0000000 Binary files a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 and /dev/null differ diff --git a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken new file mode 100755 index 0000000..5c275a7 Binary files /dev/null and b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken differ diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++ deleted file mode 100755 index 6958262..0000000 --- a/bin/arm-linux-androideabi-g++ +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/python - -from __future__ import print_function -import os -import sys -import time - -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, - "561b170a-a816-11e9-b283-6b5a5e00ead0") - 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 print_deprecation_warning(self): - print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" - "Android in 2020-01 as per the deprecation plan in:\n" - "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", - file=sys.stderr) - - - def invoke_compiler(self): - self.print_deprecation_warning() - self.set_real_compiler() - self.parse_custom_flags() - self.process_gomacc_command() - self.add_flags() - self.execargs += [self.real_compiler] + self.args - time.sleep(3) - 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/arm-linux-androideabi-g++-broken b/bin/arm-linux-androideabi-g++-broken new file mode 100755 index 0000000..6958262 --- /dev/null +++ b/bin/arm-linux-androideabi-g++-broken @@ -0,0 +1,77 @@ +#!/usr/bin/python + +from __future__ import print_function +import os +import sys +import time + +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, + "561b170a-a816-11e9-b283-6b5a5e00ead0") + 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 print_deprecation_warning(self): + print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" + "Android in 2020-01 as per the deprecation plan in:\n" + "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", + file=sys.stderr) + + + def invoke_compiler(self): + self.print_deprecation_warning() + self.set_real_compiler() + self.parse_custom_flags() + self.process_gomacc_command() + self.add_flags() + self.execargs += [self.real_compiler] + self.args + time.sleep(3) + 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/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc deleted file mode 100755 index 97c02a0..0000000 --- a/bin/arm-linux-androideabi-gcc +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/python - -from __future__ import print_function -import os -import sys -import time - -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, - "40337694-a816-11e9-ad6c-9bcb01b061bd") - 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 print_deprecation_warning(self): - print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" - "Android in 2020-01 as per the deprecation plan in:\n" - "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", - file=sys.stderr) - - - def invoke_compiler(self): - self.print_deprecation_warning() - self.set_real_compiler() - self.parse_custom_flags() - self.process_gomacc_command() - self.add_flags() - self.execargs += [self.real_compiler] + self.args - time.sleep(3) - 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/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x deleted file mode 100755 index 0bfbd65..0000000 Binary files a/bin/arm-linux-androideabi-gcc-4.9.x and /dev/null differ diff --git a/bin/arm-linux-androideabi-gcc-4.9.x-broken b/bin/arm-linux-androideabi-gcc-4.9.x-broken new file mode 100755 index 0000000..0bfbd65 Binary files /dev/null and b/bin/arm-linux-androideabi-gcc-4.9.x-broken differ diff --git a/bin/arm-linux-androideabi-gcc-broken b/bin/arm-linux-androideabi-gcc-broken new file mode 100755 index 0000000..97c02a0 --- /dev/null +++ b/bin/arm-linux-androideabi-gcc-broken @@ -0,0 +1,77 @@ +#!/usr/bin/python + +from __future__ import print_function +import os +import sys +import time + +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, + "40337694-a816-11e9-ad6c-9bcb01b061bd") + 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 print_deprecation_warning(self): + print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" + "Android in 2020-01 as per the deprecation plan in:\n" + "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", + file=sys.stderr) + + + def invoke_compiler(self): + self.print_deprecation_warning() + self.set_real_compiler() + self.parse_custom_flags() + self.process_gomacc_command() + self.add_flags() + self.execargs += [self.real_compiler] + self.args + time.sleep(3) + 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