summaryrefslogtreecommitdiffstats
path: root/build/landmines.py
diff options
context:
space:
mode:
authorjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 11:06:40 +0000
committerjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 11:06:40 +0000
commit0286b6f0099d160968f7c90e44e2b23b7b3cc689 (patch)
treef804ef82d186b96342692ee7bd8619d27a09afbc /build/landmines.py
parent628f210c7de23b47ad12c9e0564a2d52a1bd85ba (diff)
downloadchromium_src-0286b6f0099d160968f7c90e44e2b23b7b3cc689.zip
chromium_src-0286b6f0099d160968f7c90e44e2b23b7b3cc689.tar.gz
chromium_src-0286b6f0099d160968f7c90e44e2b23b7b3cc689.tar.bz2
Gyp changes for ninja iOS build.
Various tweaks to make ninja happy with our gyp files. ninja iOS builds don't CODE_SIGN yet. ninja only supports i386/simulator for now. pass parent_generator to mac_build.gypi for iOS sub-ninja builds BUG=236517 Review URL: https://chromiumcodereview.appspot.com/14577007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/landmines.py')
-rwxr-xr-xbuild/landmines.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/landmines.py b/build/landmines.py
index 7061ed5..5187b0d 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -167,7 +167,7 @@ def get_target_build_dir(build_tool, target, is_iphone=False):
target + ('-iphoneos' if is_iphone else ''))
elif build_tool == 'make':
ret = os.path.join(SRC_DIR, 'out', target)
- elif build_tool == 'ninja':
+ elif build_tool in ['ninja', 'ninja-ios']:
ret = os.path.join(SRC_DIR, 'out', target)
elif build_tool in ['msvs', 'vs', 'ib']:
ret = os.path.join(SRC_DIR, 'build', target)