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: Iabf5543ef79c6f9f301050830bdb37dbbbd5b8c7
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 329ae34..55bd671 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,
- "a5962a5a-2589-11e9-b12a-6397e4fbd97d")
+ "ee309c56-6232-11e9-a263-af5c3ba183de")
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 03632fa..8f66ee6 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,
- "a19ee8e2-2589-11e9-a52d-3f0933a56607")
+ "ac3aa62a-6232-11e9-9685-635f3b138d0d")
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 d5ac00e..0000000
--- a/bin/aarch64-linux-android-gcc-4.9.x
+++ /dev/null
Binary files differ
diff --git a/bin/a19ee8e2-2589-11e9-a52d-3f0933a56607 b/bin/ac3aa62a-6232-11e9-9685-635f3b138d0d
similarity index 100%
rename from bin/a19ee8e2-2589-11e9-a52d-3f0933a56607
rename to bin/ac3aa62a-6232-11e9-9685-635f3b138d0d
Binary files differ
diff --git a/bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d b/bin/ee309c56-6232-11e9-a263-af5c3ba183de
similarity index 100%
rename from bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d
rename to bin/ee309c56-6232-11e9-a263-af5c3ba183de
Binary files differ
