GCC 4.9: move binary names and add 1s sleeps
As per:
https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md
Also remove aarch64-linux-android-gcc-4.9.x (not sure why that exists).
Change-Id: I9e37f00a2f1313ad735921f570211ae1ec58c506
diff --git a/bin/a8fe5040-2585-11e9-9684-4b547fbede22 b/bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb
similarity index 100%
rename from bin/a8fe5040-2585-11e9-9684-4b547fbede22
rename to bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb
Binary files differ
diff --git a/bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101 b/bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b
similarity index 100%
rename from bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101
rename to bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b
Binary files differ
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 4ee0963..7061302 100755
--- a/bin/aarch64-linux-android-g++
+++ b/bin/aarch64-linux-android-g++
@@ -3,6 +3,7 @@
from __future__ import print_function
import os
import sys
+import time
class CompilerWrapper():
def __init__(self, argv):
@@ -25,7 +26,7 @@
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "c2219de2-2586-11e9-8b3d-0bdcf7ee6101")
+ "5f7cda84-6231-11e9-8e70-a31b8a0ae68b")
self.argv0 = self.real_compiler
def process_gomacc_command(self):
@@ -64,6 +65,7 @@
self.process_gomacc_command()
self.add_flags()
self.execargs += [self.real_compiler] + self.args
+ time.sleep(1)
os.execv(self.argv0, self.execargs)
diff --git a/bin/aarch64-linux-android-gcc b/bin/aarch64-linux-android-gcc
index 35ef419..0f068c0 100755
--- a/bin/aarch64-linux-android-gcc
+++ b/bin/aarch64-linux-android-gcc
@@ -3,6 +3,7 @@
from __future__ import print_function
import os
import sys
+import time
class CompilerWrapper():
def __init__(self, argv):
@@ -25,7 +26,7 @@
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "a8fe5040-2585-11e9-9684-4b547fbede22")
+ "4dd9dcb4-6231-11e9-8831-03cf79688cdb")
self.argv0 = self.real_compiler
def process_gomacc_command(self):
@@ -64,6 +65,7 @@
self.process_gomacc_command()
self.add_flags()
self.execargs += [self.real_compiler] + self.args
+ time.sleep(1)
os.execv(self.argv0, self.execargs)
diff --git a/bin/aarch64-linux-android-gcc-4.9.x b/bin/aarch64-linux-android-gcc-4.9.x
deleted file mode 100755
index cfe211a..0000000
--- a/bin/aarch64-linux-android-gcc-4.9.x
+++ /dev/null
Binary files differ
