Revert^4 "gcc-4.9: move binaries to find build breakages"
This reverts commit 9ca01e83f2e1bf34a0dd15ba5f6270c80552d341.
Reason for revert: ART test breakages have been addressed by
https://android-review.googlesource.com/c/platform/art/+/1203344
Change-Id: I8d0b4dfd63b54223685187f54a7af768d2929498
Test: m test-art-host-gtest
Bug: 147240075
Bug: 147336214
Bug: 147346243
diff --git a/bin/mips64el-linux-android-cpp b/bin/mips64el-linux-android-cpp-broken
similarity index 100%
rename from bin/mips64el-linux-android-cpp
rename to bin/mips64el-linux-android-cpp-broken
Binary files differ
diff --git a/bin/mips64el-linux-android-g++ b/bin/mips64el-linux-android-g++-broken
similarity index 100%
rename from bin/mips64el-linux-android-g++
rename to bin/mips64el-linux-android-g++-broken
diff --git a/bin/mips64el-linux-android-gcc b/bin/mips64el-linux-android-gcc
deleted file mode 100755
index 54944a2..0000000
--- a/bin/mips64el-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/mips64el-linux-android-gcc-4.9.x b/bin/mips64el-linux-android-gcc-4.9.x-broken
similarity index 100%
rename from bin/mips64el-linux-android-gcc-4.9.x
rename to bin/mips64el-linux-android-gcc-4.9.x-broken
Binary files differ
diff --git a/bin/mips64el-linux-android-g++ b/bin/mips64el-linux-android-gcc-broken
similarity index 100%
copy from bin/mips64el-linux-android-g++
copy to bin/mips64el-linux-android-gcc-broken
diff --git a/bin/real-mips64el-linux-android-g++ b/bin/real-mips64el-linux-android-g++-broken
similarity index 100%
rename from bin/real-mips64el-linux-android-g++
rename to bin/real-mips64el-linux-android-g++-broken
Binary files differ
diff --git a/bin/real-mips64el-linux-android-gcc b/bin/real-mips64el-linux-android-gcc
deleted file mode 100755
index 2b6bcd8..0000000
--- a/bin/real-mips64el-linux-android-gcc
+++ /dev/null
Binary files differ
diff --git a/bin/mips64el-linux-android-gcc-4.9.x b/bin/real-mips64el-linux-android-gcc-broken
similarity index 100%
copy from bin/mips64el-linux-android-gcc-4.9.x
copy to bin/real-mips64el-linux-android-gcc-broken
Binary files differ
