From bdf4e21fbdbf597f894de35347b008dfd5e749c7 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 16 Jul 2019 15:09:31 -0700 Subject: GCC 4.9: move binary names and add 3s sleeps As per: https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md Change-Id: I5f7d2a65a6448f248adfcb0206f5a5f61f405026 --- bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd | Bin 784928 -> 0 bytes bin/2cddb322-6232-11e9-93da-4755b1c03667 | Bin 789024 -> 0 bytes bin/40337694-a816-11e9-ad6c-9bcb01b061bd | Bin 0 -> 784928 bytes bin/561b170a-a816-11e9-b283-6b5a5e00ead0 | Bin 0 -> 789024 bytes bin/arm-linux-androideabi-g++ | 4 ++-- bin/arm-linux-androideabi-gcc | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100755 bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd delete mode 100755 bin/2cddb322-6232-11e9-93da-4755b1c03667 create mode 100755 bin/40337694-a816-11e9-ad6c-9bcb01b061bd create mode 100755 bin/561b170a-a816-11e9-b283-6b5a5e00ead0 diff --git a/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd b/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd deleted file mode 100755 index af3717d..0000000 Binary files a/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd and /dev/null differ diff --git a/bin/2cddb322-6232-11e9-93da-4755b1c03667 b/bin/2cddb322-6232-11e9-93da-4755b1c03667 deleted file mode 100755 index 8a37bdb..0000000 Binary files a/bin/2cddb322-6232-11e9-93da-4755b1c03667 and /dev/null differ diff --git a/bin/40337694-a816-11e9-ad6c-9bcb01b061bd b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd new file mode 100755 index 0000000..af3717d Binary files /dev/null and b/bin/40337694-a816-11e9-ad6c-9bcb01b061bd differ diff --git a/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 new file mode 100755 index 0000000..8a37bdb Binary files /dev/null and b/bin/561b170a-a816-11e9-b283-6b5a5e00ead0 differ diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++ index cbe488e..6958262 100755 --- a/bin/arm-linux-androideabi-g++ +++ b/bin/arm-linux-androideabi-g++ @@ -26,7 +26,7 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "2cddb322-6232-11e9-93da-4755b1c03667") + "561b170a-a816-11e9-b283-6b5a5e00ead0") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -65,7 +65,7 @@ class CompilerWrapper(): self.process_gomacc_command() self.add_flags() self.execargs += [self.real_compiler] + self.args - time.sleep(1) + time.sleep(3) os.execv(self.argv0, self.execargs) diff --git a/bin/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc index cb1efbb..97c02a0 100755 --- a/bin/arm-linux-androideabi-gcc +++ b/bin/arm-linux-androideabi-gcc @@ -26,7 +26,7 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "11e1bff0-6232-11e9-a0b8-ab0e95bc2acd") + "40337694-a816-11e9-ad6c-9bcb01b061bd") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -65,7 +65,7 @@ class CompilerWrapper(): self.process_gomacc_command() self.add_flags() self.execargs += [self.real_compiler] + self.args - time.sleep(1) + time.sleep(3) os.execv(self.argv0, self.execargs) -- cgit v1.2.3