summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-04-19 22:36:16 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-19 22:36:16 -0700
commit4564f3d4c5b907d50e46bc47a73c43d86eb36f15 (patch)
treeb0cb4094f9d9181df9508fe92d791744a7e2a54f
parentbfa12bbab8046a1b7ad820c42e8b3fd3e106e508 (diff)
parent1229b9307992d436e8fc38aa2d9899d93de8decd (diff)
downloadaarch64-linux-android-4.9-4564f3d4c5b907d50e46bc47a73c43d86eb36f15.tar.gz
GCC 4.9: move binary names and add 1s sleeps am: 01a931f653 am: 9c83bd5074
am: 1229b93079 Change-Id: Icedb459333a4c18c7362de03fad095738eba7fe8
-rwxr-xr-xbin/aarch64-linux-android-g++4
-rwxr-xr-xbin/aarch64-linux-android-gcc4
-rwxr-xr-xbin/aarch64-linux-android-gcc-4.9.xbin734964 -> 0 bytes
-rwxr-xr-xbin/ac3aa62a-6232-11e9-9685-635f3b138d0d (renamed from bin/a19ee8e2-2589-11e9-a52d-3f0933a56607)bin734964 -> 734964 bytes
-rwxr-xr-xbin/ee309c56-6232-11e9-a263-af5c3ba183de (renamed from bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d)bin739060 -> 739060 bytes
5 files changed, 6 insertions, 2 deletions
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 329ae34..55bd671 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,
- "a5962a5a-2589-11e9-b12a-6397e4fbd97d")
+ "ee309c56-6232-11e9-a263-af5c3ba183de")
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 03632fa..8f66ee6 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,
- "a19ee8e2-2589-11e9-a52d-3f0933a56607")
+ "ac3aa62a-6232-11e9-9685-635f3b138d0d")
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 d5ac00e..0000000
--- a/bin/aarch64-linux-android-gcc-4.9.x
+++ /dev/null
Binary files differ
diff --git a/bin/a19ee8e2-2589-11e9-a52d-3f0933a56607 b/bin/ac3aa62a-6232-11e9-9685-635f3b138d0d
index d5ac00e..d5ac00e 100755
--- a/bin/a19ee8e2-2589-11e9-a52d-3f0933a56607
+++ b/bin/ac3aa62a-6232-11e9-9685-635f3b138d0d
Binary files differ
diff --git a/bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d b/bin/ee309c56-6232-11e9-a263-af5c3ba183de
index cc792c2..cc792c2 100755
--- a/bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d
+++ b/bin/ee309c56-6232-11e9-a263-af5c3ba183de
Binary files differ