diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-10 04:02:06 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-10 04:02:06 +0000 |
commit | e4872ff9bfa05cdb9d3898a6af07a49ed2ee1a8e (patch) | |
tree | 09101bab22e7687ac4c21b261bd84376265ffe36 | |
parent | 942e262d0c50d94fc35fe8308dea6d00604b0a49 (diff) | |
parent | e9b2ab0932573a0ca90cad11ab75d9619f19c458 (diff) | |
download | arm-linux-androideabi-4.9-e4872ff9bfa05cdb9d3898a6af07a49ed2ee1a8e.tar.gz |
Snap for 5297348 from e9b2ab0932573a0ca90cad11ab75d9619f19c458 to qt-release
Change-Id: I5319414f923a07e1098cecd7105424b9c7377f37
-rwxr-xr-x | bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 (renamed from bin/real-arm-linux-androideabi-gcc) | bin | 784928 -> 784928 bytes | |||
-rwxr-xr-x | bin/8345f5e4-2588-11e9-ba23-c7b0d410816e (renamed from bin/real-arm-linux-androideabi-g++) | bin | 789024 -> 789024 bytes | |||
-rwxr-xr-x | bin/arm-linux-androideabi-g++ | 11 | ||||
-rwxr-xr-x | bin/arm-linux-androideabi-gcc | 11 |
4 files changed, 20 insertions, 2 deletions
diff --git a/bin/real-arm-linux-androideabi-gcc b/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 Binary files differindex af3717d..af3717d 100755 --- a/bin/real-arm-linux-androideabi-gcc +++ b/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 diff --git a/bin/real-arm-linux-androideabi-g++ b/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e Binary files differindex 8a37bdb..8a37bdb 100755 --- a/bin/real-arm-linux-androideabi-g++ +++ b/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++ index 54944a2..5923d19 100755 --- a/bin/arm-linux-androideabi-g++ +++ b/bin/arm-linux-androideabi-g++ @@ -1,5 +1,6 @@ #!/usr/bin/python +from __future__ import print_function import os import sys @@ -24,7 +25,7 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "real-" + compiler) + "8345f5e4-2588-11e9-ba23-c7b0d410816e") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -49,7 +50,15 @@ class CompilerWrapper(): def add_flags(self): self.args = self.prepend_flags + self.args + self.append_flags + def print_deprecation_warning(self): + print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" + "Android in 2020-01 as per the deprecation plan in:\n" + "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", + file=sys.stderr) + + def invoke_compiler(self): + self.print_deprecation_warning() self.set_real_compiler() self.parse_custom_flags() self.process_gomacc_command() diff --git a/bin/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc index 54944a2..e937a80 100755 --- a/bin/arm-linux-androideabi-gcc +++ b/bin/arm-linux-androideabi-gcc @@ -1,5 +1,6 @@ #!/usr/bin/python +from __future__ import print_function import os import sys @@ -24,7 +25,7 @@ class CompilerWrapper(): compiler = os.path.basename(os.path.abspath(__file__)) self.real_compiler = os.path.join( compiler_path, - "real-" + compiler) + "7fefe5b2-2588-11e9-996b-2bbad94f2d53") self.argv0 = self.real_compiler def process_gomacc_command(self): @@ -49,7 +50,15 @@ class CompilerWrapper(): def add_flags(self): self.args = self.prepend_flags + self.args + self.append_flags + def print_deprecation_warning(self): + print("Android GCC has been deprecated in favor of Clang, and will be removed from\n" + "Android in 2020-01 as per the deprecation plan in:\n" + "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md\n\n", + file=sys.stderr) + + def invoke_compiler(self): + self.print_deprecation_warning() self.set_real_compiler() self.parse_custom_flags() self.process_gomacc_command() |