summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-04-19 18:39:06 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-19 18:39:06 -0700
commitcf8117945813ecb666951c9cacdfe06909ba49dd (patch)
tree9e763c00a3c123aac4e497d1b742f8792faddeec
parent794301a14990fa0cab129696d01fa56e3d24d4c6 (diff)
parent2f1ff53c6af8593be2325d5b21dbb3d1ca3251bc (diff)
downloadaarch64-linux-android-4.9-cf8117945813ecb666951c9cacdfe06909ba49dd.tar.gz
GCC 4.9: move binary names and add 1s sleeps am: 8f7a539963 am: abf20060fb
am: 2f1ff53c6a Change-Id: I057070822829537e1fe10b87313f10d80f087e8d
-rwxr-xr-xbin/4dd9dcb4-6231-11e9-8831-03cf79688cdb (renamed from bin/a8fe5040-2585-11e9-9684-4b547fbede22)bin772640 -> 772640 bytes
-rwxr-xr-xbin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b (renamed from bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101)bin776736 -> 776736 bytes
-rwxr-xr-xbin/aarch64-linux-android-g++4
-rwxr-xr-xbin/aarch64-linux-android-gcc4
-rwxr-xr-xbin/aarch64-linux-android-gcc-4.9.xbin772640 -> 0 bytes
5 files changed, 6 insertions, 2 deletions
diff --git a/bin/a8fe5040-2585-11e9-9684-4b547fbede22 b/bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb
index cfe211a..cfe211a 100755
--- a/bin/a8fe5040-2585-11e9-9684-4b547fbede22
+++ b/bin/4dd9dcb4-6231-11e9-8831-03cf79688cdb
Binary files differ
diff --git a/bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101 b/bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b
index efe9a5e..efe9a5e 100755
--- a/bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101
+++ b/bin/5f7cda84-6231-11e9-8e70-a31b8a0ae68b
Binary files differ
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 4ee0963..7061302 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 @@ class CompilerWrapper():
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "c2219de2-2586-11e9-8b3d-0bdcf7ee6101")
+ "5f7cda84-6231-11e9-8e70-a31b8a0ae68b")
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/aarch64-linux-android-gcc b/bin/aarch64-linux-android-gcc
index 35ef419..0f068c0 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 @@ class CompilerWrapper():
compiler = os.path.basename(os.path.abspath(__file__))
self.real_compiler = os.path.join(
compiler_path,
- "a8fe5040-2585-11e9-9684-4b547fbede22")
+ "4dd9dcb4-6231-11e9-8831-03cf79688cdb")
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/aarch64-linux-android-gcc-4.9.x b/bin/aarch64-linux-android-gcc-4.9.x
deleted file mode 100755
index cfe211a..0000000
--- a/bin/aarch64-linux-android-gcc-4.9.x
+++ /dev/null
Binary files differ