summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 06:52:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 06:52:57 +0000
commit24f28106e56e066850673590024592b17468fb32 (patch)
treee69a0e7cce040143616fd3c303e79ffa3ae37cd6
parentd49f4f014938d3890d5a61eef32eda5b6c81ceef (diff)
parent67ab31fd50fcc6047fcf7026780ca48f08c084cf (diff)
downloadarm-linux-androideabi-4.9-24f28106e56e066850673590024592b17468fb32.tar.gz
gcc-4.9: remove GCC from Android am: 67ab31fd50android-r-preview-4android-r-preview-3android-r-preview-2
Change-Id: I3e0ad14490b634eff857010167eb8010ef4e324f
-rwxr-xr-xbin/187530ac-a8b1-11e9-9bda-b75764d8e8ab-brokenbin751436 -> 0 bytes
-rwxr-xr-xbin/4ed8ac1e-a8b1-11e9-b213-db26fa121454-brokenbin747340 -> 0 bytes
l---------bin/arm-linux-androideabi-c++1
-rwxr-xr-xbin/arm-linux-androideabi-cpp-brokenbin747340 -> 0 bytes
-rwxr-xr-xbin/arm-linux-androideabi-g++-broken77
l---------bin/arm-linux-androideabi-gcc-4.91
-rwxr-xr-xbin/arm-linux-androideabi-gcc-4.9.x-brokenbin747340 -> 0 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gcc-broken77
l---------bin/arm-linux-androidkernel-cpp1
l---------bin/arm-linux-androidkernel-gcc1
10 files changed, 0 insertions, 158 deletions
diff --git a/bin/187530ac-a8b1-11e9-9bda-b75764d8e8ab-broken b/bin/187530ac-a8b1-11e9-9bda-b75764d8e8ab-broken
deleted file mode 100755
index 00ca908..0000000
--- a/bin/187530ac-a8b1-11e9-9bda-b75764d8e8ab-broken
+++ /dev/null
Binary files differ
diff --git a/bin/4ed8ac1e-a8b1-11e9-b213-db26fa121454-broken b/bin/4ed8ac1e-a8b1-11e9-b213-db26fa121454-broken
deleted file mode 100755
index 9e4ba39..0000000
--- a/bin/4ed8ac1e-a8b1-11e9-b213-db26fa121454-broken
+++ /dev/null
Binary files 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-cpp-broken b/bin/arm-linux-androideabi-cpp-broken
deleted file mode 100755
index bc2dc7d..0000000
--- a/bin/arm-linux-androideabi-cpp-broken
+++ /dev/null
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++-broken b/bin/arm-linux-androideabi-g++-broken
deleted file mode 100755
index 288c385..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,
- "187530ac-a8b1-11e9-9bda-b75764d8e8ab")
- 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 9e4ba39..0000000
--- a/bin/arm-linux-androideabi-gcc-4.9.x-broken
+++ /dev/null
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-broken b/bin/arm-linux-androideabi-gcc-broken
deleted file mode 100755
index a6edfc6..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,
- "4ed8ac1e-a8b1-11e9-b213-db26fa121454")
- 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-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