diff options
author | Nick Desaulniers <ndesaulniers@google.com> | 2019-02-08 13:36:46 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-08 13:36:46 -0800 |
commit | aa268ad86278eb36915601b10579ada47d07bcd1 (patch) | |
tree | c731d5803ed51ad6bed17d58d768f92999b86cd2 | |
parent | 75c0ace0eb9ba47c11df56971e7f63f2ebaa9fbd (diff) | |
parent | aee49f6942a6a9801f960112b7b1d82b64f20ba7 (diff) | |
download | aarch64-linux-android-4.9-aa268ad86278eb36915601b10579ada47d07bcd1.tar.gz |
Add GCC deprecation warning and link to deprecation schedule.
am: aee49f6942
Change-Id: I995394b7c9af9927ccb17212018b90a68fb10568
-rwxr-xr-x | bin/a8fe5040-2585-11e9-9684-4b547fbede22 (renamed from bin/real-aarch64-linux-android-gcc) | bin | 772640 -> 772640 bytes | |||
-rwxr-xr-x | bin/aarch64-linux-android-g++ | 11 | ||||
-rwxr-xr-x | bin/aarch64-linux-android-gcc | 11 | ||||
-rwxr-xr-x | bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101 (renamed from bin/real-aarch64-linux-android-g++) | bin | 776736 -> 776736 bytes |
4 files changed, 20 insertions, 2 deletions
diff --git a/bin/real-aarch64-linux-android-gcc b/bin/a8fe5040-2585-11e9-9684-4b547fbede22 Binary files differindex cfe211a..cfe211a 100755 --- a/bin/real-aarch64-linux-android-gcc +++ b/bin/a8fe5040-2585-11e9-9684-4b547fbede22 diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++ index 54944a2..4ee0963 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) + "c2219de2-2586-11e9-8b3d-0bdcf7ee6101") 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..35ef419 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) + "a8fe5040-2585-11e9-9684-4b547fbede22") 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-aarch64-linux-android-g++ b/bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101 Binary files differindex efe9a5e..efe9a5e 100755 --- a/bin/real-aarch64-linux-android-g++ +++ b/bin/c2219de2-2586-11e9-8b3d-0bdcf7ee6101 |