summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-04-19 16:18:46 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-19 16:18:46 -0700
commit7df9a0eb2698f8c207e3f32ba9df859bb4bb23f9 (patch)
treef0ab66baba5200d2fe9383a6fa916b687d91c702
parent1ff98c9aae35e681fc805c124448200bac668892 (diff)
parent0861eecfccbac8d407e7db20f5b0103887959a50 (diff)
downloadarm-linux-androideabi-4.9-7df9a0eb2698f8c207e3f32ba9df859bb4bb23f9.tar.gz
GCC 4.9: move binary names and add 1s sleepsandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
am: 0861eecfcc Change-Id: Iff9ae20bbb32611eff942f629b6f2627c3de248c
-rwxr-xr-xbin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1 (renamed from bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4)bin751436 -> 751436 bytes
-rwxr-xr-xbin/arm-linux-androideabi-g++4
-rwxr-xr-xbin/arm-linux-androideabi-gcc4
-rwxr-xr-xbin/arm-linux-androideabi-gcc-4.9.xbin747340 -> 0 bytes
4 files changed, 6 insertions, 2 deletions
diff --git a/bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4 b/bin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1
index f0c155b..f0c155b 100755
--- a/bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4
+++ b/bin/762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++
index 6eb60af..b2b074a 100755
--- a/bin/arm-linux-androideabi-g++
+++ b/bin/arm-linux-androideabi-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,
- "edbbb32c-2589-11e9-9d3a-3feaeedb4eb4")
+ "762b5a4c-6233-11e9-b0ae-3bf5e0eba7d1")
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/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc
index 93eb445..9f9d88c 100755
--- a/bin/arm-linux-androideabi-gcc
+++ b/bin/arm-linux-androideabi-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,
- "eac354ea-2589-11e9-8634-4b9fc1cc7ade")
+ "3856835e-6233-11e9-9327-8b7e61ad9ffa")
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/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x
deleted file mode 100755
index 6b8e257..0000000
--- a/bin/arm-linux-androideabi-gcc-4.9.x
+++ /dev/null
Binary files differ