summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-07-17 14:57:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-17 14:57:48 -0700
commite8af8b062815667f464c2f18b910b4ded9e1dfb3 (patch)
tree3ebd93c1091a227f8dab097306f0037a36eb1f0e
parenta8f8c6e41b5be634b9b6bf100139731cbd56b218 (diff)
parentc0569461b724940ca7331f03b8d65ec8849c93b7 (diff)
downloadaarch64-linux-android-4.9-e8af8b062815667f464c2f18b910b4ded9e1dfb3.tar.gz
GCC 4.9: move binary names and add 3s sleeps am: ae8d98ffb7 am: 6e0974c00a am: a86cfd07a0
am: c0569461b7 Change-Id: Ie11f83af487707cbfa69cbb3c7883be99522c53b
-rwxr-xr-xbin/921d9846-a815-11e9-84ea-ff8bce1b90b6 (renamed from bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb)bin772640 -> 772640 bytes
-rwxr-xr-xbin/aarch64-linux-android-g++4
-rwxr-xr-xbin/aarch64-linux-android-gcc4
-rwxr-xr-xbin/db96eedc-a815-11e9-a708-d79346614c9b (renamed from bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b)bin776736 -> 776736 bytes
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb b/bin/921d9846-a815-11e9-84ea-ff8bce1b90b6
index cfe211a..cfe211a 100755
--- a/bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb
+++ b/bin/921d9846-a815-11e9-84ea-ff8bce1b90b6
Binary files differ
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 7061302..c1ce465 100755
--- a/bin/aarch64-linux-android-g++
+++ b/bin/aarch64-linux-android-g++
@@ -26,7 +26,7 @@ class CompilerWrapper():
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "5f7cda84-6231-11e9-8e70-a31b8a0ae68b")
+ "db96eedc-a815-11e9-a708-d79346614c9b")
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/aarch64-linux-android-gcc b/bin/aarch64-linux-android-gcc
index 0f068c0..d454c40 100755
--- a/bin/aarch64-linux-android-gcc
+++ b/bin/aarch64-linux-android-gcc
@@ -26,7 +26,7 @@ class CompilerWrapper():
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "4dd9dcb4-6231-11e9-8831-03cf79688cdb")
+ "921d9846-a815-11e9-84ea-ff8bce1b90b6")
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/5f7cda84-6231-11e9-8e70-a31b8a0ae68b b/bin/db96eedc-a815-11e9-a708-d79346614c9b
index efe9a5e..efe9a5e 100755
--- a/bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b
+++ b/bin/db96eedc-a815-11e9-a708-d79346614c9b
Binary files differ