Add GCC deprecation warning and link to deprecation schedule. am: bdb57364ad am: 4aa8569e6b

am: 2d0a6d9181

Change-Id: I8fd9e7c4c6c68e1e4bbc013572c4f84955b2591d

4 files changed, 20 insertions, 2 deletions

diff --git a/bin/real-arm-linux-androideabi-gcc b/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53
index 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
index 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()