summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-07-17 14:38:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-17 14:38:34 -0700
commit052801f5c64ba9bd9a8418a914a0d7ac25da9756 (patch)
treeb4c57f4395973ecc797923fabbc5ff76a51a5e8f
parentc9e2a2246b5a6b25fbf646f8743984e52a9f9a59 (diff)
parent8076426b155aca69fa64eb2cd49f7ee080089e83 (diff)
downloadarm-linux-androideabi-4.9-052801f5c64ba9bd9a8418a914a0d7ac25da9756.tar.gz
GCC 4.9: move binary names and add 3s sleeps am: ce58c99e1b
am: 8076426b15 Change-Id: I9016d7cc79be0157707748b1d83b2c66e69a54c5
-rwxr-xr-xbin/187530ac-a8b1-11e9-9bda-b75764d8e8ab (renamed from bin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1)bin751436 -> 751436 bytes
-rwxr-xr-xbin/4ed8ac1e-a8b1-11e9-b213-db26fa121454 (renamed from bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade)bin747340 -> 747340 bytes
-rwxr-xr-xbin/arm-linux-androideabi-g++4
-rwxr-xr-xbin/arm-linux-androideabi-gcc4
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1 b/bin/187530ac-a8b1-11e9-9bda-b75764d8e8ab
index f0c155b..f0c155b 100755
--- a/bin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1
+++ b/bin/187530ac-a8b1-11e9-9bda-b75764d8e8ab
Binary files differ
diff --git a/bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade b/bin/4ed8ac1e-a8b1-11e9-b213-db26fa121454
index 6b8e257..6b8e257 100755
--- a/bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade
+++ b/bin/4ed8ac1e-a8b1-11e9-b213-db26fa121454
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++
index b2b074a..288c385 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,
- "762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1")
+ "187530ac-a8b1-11e9-9bda-b75764d8e8ab")
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 9f9d88c..a6edfc6 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,
- "3856835e-6233-11e9-9327-8b7e61ad9ffa")
+ "4ed8ac1e-a8b1-11e9-b213-db26fa121454")
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)