Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2356)

Unified Diff: build/toolchain/android/find_android_compiler.py

Issue 99333020: Remove -fstack-protector-strong from the ChromeOS GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | build/toolchain/linux/find_android_compilers.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/android/find_android_compiler.py
diff --git a/build/toolchain/linux/find_android_compilers.py b/build/toolchain/android/find_android_compiler.py
similarity index 71%
rename from build/toolchain/linux/find_android_compilers.py
rename to build/toolchain/android/find_android_compiler.py
index 7061eccd24f33a5a3f1ccb63b5afe1b03dd6c525..d806ead80d554d76e205d8e1b4c60692a32bae1b 100644
--- a/build/toolchain/linux/find_android_compilers.py
+++ b/build/toolchain/android/find_android_compiler.py
@@ -19,8 +19,18 @@ if len(sys.argv) != 2:
android_toolchain = sys.argv[1]
cc = glob.glob(android_toolchain + "/*-gcc")
cxx = glob.glob(android_toolchain + "/*-g++")
+
+# We tolerate "no matches." In the Android AOSP WebView build, it runs this
+# logic and the directory doesn't exist, giving no matches. But that build runs
+# GYP to generate Android Makefiles which specify the compiler separately. So
+# all we need to do in this case is ignore the error and continue with empty
+# target compilers.
+if len(cc) == 0:
+ cc = [""]
+if len(cxx) == 0:
+ cxx = [""]
if len(cc) != 1 or len(cxx) != 1:
- print "Either none or more than one matching compiler."
+ print "More than one matching compiler."
sys.exit(1)
# Get the host compilers from the current path.
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | build/toolchain/linux/find_android_compilers.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698