summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-07-17 14:48:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-17 14:48:49 -0700
commit5a4daf49866fcea0a77ee8a83b27b011809c66b6 (patch)
tree5fe6baf231c82e1e6c80996fb48302f053a3a025
parent1229b9307992d436e8fc38aa2d9899d93de8decd (diff)
parente53648fe1b623f1bafb81355e707b6f172db0c64 (diff)
downloadaarch64-linux-android-4.9-5a4daf49866fcea0a77ee8a83b27b011809c66b6.tar.gz
GCC 4.9: move binary names and add 3s sleeps am: 79c7e3e6ed am: 342f6bb040
am: e53648fe1b Change-Id: I2474fcc2458952ca3092b10c1c31576929376494
-rwxr-xr-xbin/84372336-a816-11e9-9669-5b66bd3072d3 (renamed from bin/ac3aa62a-6232-11e9-9685-635f3b138d0d)bin734964 -> 734964 bytes
-rwxr-xr-xbin/98880972-a816-11e9-80c0-33dd338bc3b2 (renamed from bin/ee309c56-6232-11e9-a263-af5c3ba183de)bin739060 -> 739060 bytes
-rwxr-xr-xbin/aarch64-linux-android-g++4
-rwxr-xr-xbin/aarch64-linux-android-gcc4
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/ac3aa62a-6232-11e9-9685-635f3b138d0d b/bin/84372336-a816-11e9-9669-5b66bd3072d3
index d5ac00e..d5ac00e 100755
--- a/bin/ac3aa62a-6232-11e9-9685-635f3b138d0d
+++ b/bin/84372336-a816-11e9-9669-5b66bd3072d3
Binary files differ
diff --git a/bin/ee309c56-6232-11e9-a263-af5c3ba183de b/bin/98880972-a816-11e9-80c0-33dd338bc3b2
index cc792c2..cc792c2 100755
--- a/bin/ee309c56-6232-11e9-a263-af5c3ba183de
+++ b/bin/98880972-a816-11e9-80c0-33dd338bc3b2
Binary files differ
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 55bd671..4fe6430 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,
- "ee309c56-6232-11e9-a263-af5c3ba183de")
+ "98880972-a816-11e9-80c0-33dd338bc3b2")
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 8f66ee6..aea6314 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,
- "ac3aa62a-6232-11e9-9685-635f3b138d0d")
+ "84372336-a816-11e9-9669-5b66bd3072d3")
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)