diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-02-08 13:43:39 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-08 13:43:39 -0800 |
| commit | 7794f77aa71ac2d975f61a31e1e90c5cba0d56cc (patch) | |
| tree | c0b3018722cf90b9df53b93497cc854ed6dca2e2 | |
| parent | 1a8baf87c200a98cb7a1373cb0fbddced03e7a08 (diff) | |
| parent | 17952cd88a795244f6c6ceaec79f5ded36727602 (diff) | |
| download | aarch64-linux-android-4.9-7794f77aa71ac2d975f61a31e1e90c5cba0d56cc.tar.gz | |
Add GCC deprecation warning and link to deprecation schedule. am: cf54b6c23f am: d3718c2894
am: 17952cd88a
Change-Id: Ie50633cec4802cd2cf4f743218e18fc8d28fa9c1
| -rwxr-xr-x | bin/a19ee8e2-2589-11e9-a52d-3f0933a56607 (renamed from bin/real-aarch64-linux-android-gcc) | bin | 734964 -> 734964 bytes | |||
| -rwxr-xr-x | bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d (renamed from bin/real-aarch64-linux-android-g++) | bin | 739060 -> 739060 bytes | |||
| -rwxr-xr-x | bin/aarch64-linux-android-g++ | 11 | ||||
| -rwxr-xr-x | bin/aarch64-linux-android-gcc | 11 |
4 files changed, 20 insertions, 2 deletions
diff --git a/bin/real-aarch64-linux-android-gcc b/bin/a19ee8e2-2589-11e9-a52d-3f0933a56607 Binary files differindex d5ac00e..d5ac00e 100755 --- a/bin/real-aarch64-linux-android-gcc +++ b/bin/a19ee8e2-2589-11e9-a52d-3f0933a56607 diff --git a/bin/real-aarch64-linux-android-g++ b/bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d Binary files differindex cc792c2..cc792c2 100755 --- a/bin/real-aarch64-linux-android-g++ +++ b/bin/a5962a5a-2589-11e9-b12a-6397e4fbd97d diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++ index 54944a2..329ae34 100755 --- a/bin/aarch64-linux-android-g++ +++ b/bin/aarch64-linux-android-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) + "a5962a5a-2589-11e9-b12a-6397e4fbd97d") 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/aarch64-linux-android-gcc b/bin/aarch64-linux-android-gcc index 54944a2..03632fa 100755 --- a/bin/aarch64-linux-android-gcc +++ b/bin/aarch64-linux-android-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) + "a19ee8e2-2589-11e9-a52d-3f0933a56607") 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() |