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

Unified Diff: build/gyp_chromium

Issue 171903002: android envsetup: Stop honoring --target-arch parameter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months 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
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index e4cafc756134c35dc51c7ec3ea111bfef5157653..ae1d4c2f66242d7c883b990078479bfd92f86836 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -177,6 +177,11 @@ def GetArgsStringForGN(supplemental_files):
supplemental_files += [include_gypi]
vars_dict = GetGypVarsForGN(supplemental_files)
+ # It's not possible to let set a default value for cpu_arch in GN, so do it
+ # here for now (http://crbug.com/344767).
+ if vars_dict.get('OS') == 'android' and not 'target_arch' in vars_dict:
+ vars_dict['target_arch'] = 'arm'
+
gn_args = ''
# Note: These are the additional flags passed to various builds by builders
« no previous file with comments | « build/common.gypi ('k') | tools/cr/cr/base/android.py » ('j') | tools/cr/cr/base/android.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698