summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 07:04:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 07:04:21 +0000
commit248a6474d96af22d22d9fa7ca0675579f6aca1d0 (patch)
tree7d580e60281c9d472304fc597adb62cd306a5e2b
parent8c863682acf02f96458d5c06f94c920b020843af (diff)
parent5f6784551ded13db5cb9894acc9ec2a1090cb65c (diff)
downloadx86_64-linux-android-4.9-248a6474d96af22d22d9fa7ca0675579f6aca1d0.tar.gz
gcc-4.9: remove GCC from Android am: f320a6d91f am: 5f6784551d
Change-Id: If025813b70c6bb536491fea44e6b559a72ea20cb
-rwxr-xr-xbin/real-x86_64-linux-android-g++-brokenbin775756 -> 0 bytes
-rwxr-xr-xbin/real-x86_64-linux-android-gcc-brokenbin771660 -> 0 bytes
l---------bin/x86_64-linux-android-c++1
-rwxr-xr-xbin/x86_64-linux-android-cpp-brokenbin775756 -> 0 bytes
-rwxr-xr-xbin/x86_64-linux-android-g++-broken66
l---------bin/x86_64-linux-android-gcc-4.91
-rwxr-xr-xbin/x86_64-linux-android-gcc-4.9.x-brokenbin771660 -> 0 bytes
-rwxr-xr-xbin/x86_64-linux-android-gcc-broken66
l---------bin/x86_64-linux-androidkernel-cpp1
l---------bin/x86_64-linux-androidkernel-gcc1
10 files changed, 0 insertions, 136 deletions
diff --git a/bin/real-x86_64-linux-android-g++-broken b/bin/real-x86_64-linux-android-g++-broken
deleted file mode 100755
index 5c8990a..0000000
--- a/bin/real-x86_64-linux-android-g++-broken
+++ /dev/null
Binary files differ
diff --git a/bin/real-x86_64-linux-android-gcc-broken b/bin/real-x86_64-linux-android-gcc-broken
deleted file mode 100755
index 7c272ef..0000000
--- a/bin/real-x86_64-linux-android-gcc-broken
+++ /dev/null
Binary files differ
diff --git a/bin/x86_64-linux-android-c++ b/bin/x86_64-linux-android-c++
deleted file mode 120000
index 425d82a..0000000
--- a/bin/x86_64-linux-android-c++
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-g++ \ No newline at end of file
diff --git a/bin/x86_64-linux-android-cpp-broken b/bin/x86_64-linux-android-cpp-broken
deleted file mode 100755
index 65cf353..0000000
--- a/bin/x86_64-linux-android-cpp-broken
+++ /dev/null
Binary files differ
diff --git a/bin/x86_64-linux-android-g++-broken b/bin/x86_64-linux-android-g++-broken
deleted file mode 100755
index 54944a2..0000000
--- a/bin/x86_64-linux-android-g++-broken
+++ /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 b/bin/x86_64-linux-android-gcc-4.9
deleted file mode 120000
index c953618..0000000
--- a/bin/x86_64-linux-android-gcc-4.9
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-gcc \ No newline at end of file
diff --git a/bin/x86_64-linux-android-gcc-4.9.x-broken b/bin/x86_64-linux-android-gcc-4.9.x-broken
deleted file mode 100755
index 7c272ef..0000000
--- a/bin/x86_64-linux-android-gcc-4.9.x-broken
+++ /dev/null
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc-broken b/bin/x86_64-linux-android-gcc-broken
deleted file mode 100755
index 54944a2..0000000
--- a/bin/x86_64-linux-android-gcc-broken
+++ /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-androidkernel-cpp b/bin/x86_64-linux-androidkernel-cpp
deleted file mode 120000
index 8163a00..0000000
--- a/bin/x86_64-linux-androidkernel-cpp
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-cpp \ No newline at end of file
diff --git a/bin/x86_64-linux-androidkernel-gcc b/bin/x86_64-linux-androidkernel-gcc
deleted file mode 120000
index c953618..0000000
--- a/bin/x86_64-linux-androidkernel-gcc
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-gcc \ No newline at end of file