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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/ios/mac_build.gypi

Issue 14577007: Gyp changes for ninja iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set generator inside mac_build Created 7 years, 8 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
« no previous file with comments | « build/common.gypi ('k') | build/landmines.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/ios/mac_build.gypi
diff --git a/build/ios/mac_build.gypi b/build/ios/mac_build.gypi
index dd5ad1d24948465fba6882cb08bce8ae47502c44..cbdbc79d17f08b3785b8d87732f3cf1deb9a288e 100644
--- a/build/ios/mac_build.gypi
+++ b/build/ios/mac_build.gypi
@@ -39,6 +39,10 @@
# }
{
'variables': {
+ 'variables': {
+ 'parent_generator%': '<(GENERATOR)',
+ },
+ 'parent_generator%': '<(parent_generator)',
# Common ninja command line flags.
'ninja_cmd': [
# Bounce through clean_env to clean up the environment so things
@@ -67,6 +71,7 @@
'-Dios_mac_build=1',
# Pass through the Mac SDK version.
'-Dmac_sdk=<(mac_sdk)',
+ '-Dparent_generator=<(parent_generator)'
],
# Rerun gyp for each of the projects needed. This is what actually
« no previous file with comments | « build/common.gypi ('k') | build/landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698