From 7e837ec55a3b864da5608f834062bf16951133cb Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Fri, 31 Jan 2020 06:52:55 -0800 Subject: gcc-4.9: remove GCC from Android The king is dead, long live the king. Change-Id: Ie1b9b97f8fd98d870e7c6e0799bef8327683f0d1 Link: https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md Bug: 147240075 Test: N/A Signed-off-by: Nick Desaulniers --- bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken | Bin 784928 -> 0 bytes bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken | Bin 789024 -> 0 bytes bin/arm-linux-androideabi-c++ | 1 - bin/arm-linux-androideabi-g++-broken | 77 ------------------------ bin/arm-linux-androideabi-gcc-4.9 | 1 - bin/arm-linux-androideabi-gcc-4.9.x-broken | Bin 784928 -> 0 bytes bin/arm-linux-androideabi-gcc-broken | 77 ------------------------ bin/arm-linux-androidkernel-cpp | 1 - bin/arm-linux-androidkernel-gcc | 1 - 9 files changed, 158 deletions(-) delete mode 100755 bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken delete mode 100755 bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken delete mode 120000 bin/arm-linux-androideabi-c++ delete mode 100755 bin/arm-linux-androideabi-g++-broken delete mode 120000 bin/arm-linux-androideabi-gcc-4.9 delete mode 100755 bin/arm-linux-androideabi-gcc-4.9.x-broken delete mode 100755 bin/arm-linux-androideabi-gcc-broken delete mode 120000 bin/arm-linux-androidkernel-cpp delete mode 120000 bin/arm-linux-androidkernel-gcc diff --git a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken deleted file mode 100755 index 0bfbd65..0000000 Binary files a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd-broken and /dev/null differ diff --git a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken deleted file mode 100755 index 5c275a7..0000000 Binary files a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0-broken and /dev/null differ diff --git a/bin/arm-linux-androideabi-c++ b/bin/arm-linux-androideabi-c++ deleted file mode 120000 index 818bae6..0000000 --- a/bin/arm-linux-androideabi-c++ +++ /dev/null @@ -1 +0,0 @@ -arm-linux-androideabi-g++ \ No newline at end of file diff --git a/bin/arm-linux-androideabi-g++-broken b/bin/arm-linux-androideabi-g++-broken deleted file mode 100755 index 6958262..0000000 --- a/bin/arm-linux-androideabi-g++-broken +++ /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-gcc-4.9 b/bin/arm-linux-androideabi-gcc-4.9 deleted file mode 120000 index b8b9fad..0000000 --- a/bin/arm-linux-androideabi-gcc-4.9 +++ /dev/null @@ -1 +0,0 @@ -arm-linux-androideabi-gcc \ No newline at end of file diff --git a/bin/arm-linux-androideabi-gcc-4.9.x-broken b/bin/arm-linux-androideabi-gcc-4.9.x-broken deleted file mode 100755 index 0bfbd65..0000000 Binary files a/bin/arm-linux-androideabi-gcc-4.9.x-broken and /dev/null differ diff --git a/bin/arm-linux-androideabi-gcc-broken b/bin/arm-linux-androideabi-gcc-broken deleted file mode 100755 index 831df9e..0000000 --- a/bin/arm-linux-androideabi-gcc-broken +++ /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(10) - 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-androidkernel-cpp b/bin/arm-linux-androidkernel-cpp deleted file mode 120000 index c4b7347..0000000 --- a/bin/arm-linux-androidkernel-cpp +++ /dev/null @@ -1 +0,0 @@ -arm-linux-androideabi-cpp \ No newline at end of file diff --git a/bin/arm-linux-androidkernel-gcc b/bin/arm-linux-androidkernel-gcc deleted file mode 120000 index b8b9fad..0000000 --- a/bin/arm-linux-androidkernel-gcc +++ /dev/null @@ -1 +0,0 @@ -arm-linux-androideabi-gcc \ No newline at end of file -- cgit v1.2.3