diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-02-08 13:39:42 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-08 13:39:42 -0800 |
| commit | da91bbb7b3cfdd7d92913ea12111727e13dc3a39 (patch) | |
| tree | 9a13a835f998b5c58965ff71f196d3ab9491eebe | |
| parent | 2a30952bd7ad7526424b4ac20a5e58a7aae0e17f (diff) | |
| parent | 459063b97e7e50b93ac59ae9d7ef102212ff483a (diff) | |
| download | arm-linux-androideabi-4.9-da91bbb7b3cfdd7d92913ea12111727e13dc3a39.tar.gz | |
Add GCC deprecation warning and link to deprecation schedule. am: 078b3c316b
am: 459063b97e
Change-Id: I9260a945d11046c35d7fd4ff0e9de829b0bee310
| -rwxr-xr-x | bin/arm-linux-androideabi-g++ | 11 | ||||
| -rwxr-xr-x | bin/arm-linux-androideabi-gcc | 11 | ||||
| -rwxr-xr-x | bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade (renamed from bin/real-arm-linux-androideabi-gcc) | bin | 747340 -> 747340 bytes | |||
| -rwxr-xr-x | bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4 (renamed from bin/real-arm-linux-androideabi-g++) | bin | 751436 -> 751436 bytes |
4 files changed, 20 insertions, 2 deletions
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++ index 54944a2..6eb60af 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) + "edbbb32c-2589-11e9-9d3a-3feaeedb4eb4") 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..93eb445 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) + "eac354ea-2589-11e9-8634-4b9fc1cc7ade") 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/real-arm-linux-androideabi-gcc b/bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade Binary files differindex 6b8e257..6b8e257 100755 --- a/bin/real-arm-linux-androideabi-gcc +++ b/bin/eac354ea-2589-11e9-8634-4b9fc1cc7ade diff --git a/bin/real-arm-linux-androideabi-g++ b/bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4 Binary files differindex f0c155b..f0c155b 100755 --- a/bin/real-arm-linux-androideabi-g++ +++ b/bin/edbbb32c-2589-11e9-9d3a-3feaeedb4eb4 |