From fa9fc8d9877663ad50f445749b4bc02b9664b4d9 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 18 Apr 2019 16:32:30 -0700 Subject: 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 arm-linux-androideabi-gcc-4.9.x (not sure why that exists). Change-Id: Ib2c70537e61551f833f613f141a1bb4a4b109341 --- bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd | Bin 0 -> 784928 bytes bin/2cddb322-6232-11e9-93da-4755b1c03667 | Bin 0 -> 789024 bytes bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 | Bin 784928 -> 0 bytes bin/8345f5e4-2588-11e9-ba23-c7b0d410816e | Bin 789024 -> 0 bytes bin/arm-linux-androideabi-g++ | 4 +++- bin/arm-linux-androideabi-gcc | 4 +++- bin/arm-linux-androideabi-gcc-4.9.x | Bin 784928 -> 0 bytes 7 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd create mode 100755 bin/2cddb322-6232-11e9-93da-4755b1c03667 delete mode 100755 bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 delete mode 100755 bin/8345f5e4-2588-11e9-ba23-c7b0d410816e delete mode 100755 bin/arm-linux-androideabi-gcc-4.9.x diff --git a/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd b/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd new file mode 100755 index 0000000..af3717d Binary files /dev/null and b/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd differ diff --git a/bin/2cddb322-6232-11e9-93da-4755b1c03667 b/bin/2cddb322-6232-11e9-93da-4755b1c03667 new file mode 100755 index 0000000..8a37bdb Binary files /dev/null and b/bin/2cddb322-6232-11e9-93da-4755b1c03667 differ diff --git a/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 b/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 deleted file mode 100755 index af3717d..0000000 Binary files a/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 and /dev/null differ diff --git a/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e b/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e deleted file mode 100755 index 8a37bdb..0000000 Binary files a/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e and /dev/null differ diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++ index 5923d19..cbe488e 100755 --- a/bin/arm-linux-androideabi-g++ +++ b/bin/arm-linux-androideabi-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 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "8345f5e4-2588-11e9-ba23-c7b0d410816e") + "2cddb322-6232-11e9-93da-4755b1c03667") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -64,6 +65,7 @@ class CompilerWrapper(): 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/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc index e937a80..cb1efbb 100755 --- a/bin/arm-linux-androideabi-gcc +++ b/bin/arm-linux-androideabi-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 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "7fefe5b2-2588-11e9-996b-2bbad94f2d53") + "11e1bff0-6232-11e9-a0b8-ab0e95bc2acd") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -64,6 +65,7 @@ class CompilerWrapper(): 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/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x deleted file mode 100755 index af3717d..0000000 Binary files a/bin/arm-linux-androideabi-gcc-4.9.x and /dev/null differ -- cgit v1.2.3