summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-09-15 16:37:28 -0700
committerLei Zhang <thestig@chromium.org>2015-09-15 16:37:28 -0700
commitb693fc5525f7fdff68245e357ca628acd9d8918c (patch)
tree23f3cd03f40481405b6551b2cd96d92606c2ad71
parentf02260d970bfc29c233d5018c8c1bd89b9daf55b (diff)
downloadpdfium-b693fc5525f7fdff68245e357ca628acd9d8918c.tar.xz
Merge to XFA: gyp_pdfium should use ninja by default.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1330173002 . (cherry picked from commit 8b1cb99abd4dcff132367fe338df38e48971bd1d) Review URL: https://codereview.chromium.org/1345973002 .
-rwxr-xr-xbuild/gyp_pdfium11
1 files changed, 8 insertions, 3 deletions
diff --git a/build/gyp_pdfium b/build/gyp_pdfium
index 7019795d09..fca2ca39b6 100755
--- a/build/gyp_pdfium
+++ b/build/gyp_pdfium
@@ -28,15 +28,20 @@ def run_gyp(args):
def main():
args = sys.argv[1:]
args.append(os.path.join(script_dir, 'all.gyp'))
-
+
args.append('-I')
args.append(os.path.join(pdfium_root, 'build', 'standalone.gypi'))
-
+
args.extend(['-D', 'gyp_output_dir=out'])
# Set the GYP DEPTH variable to the root of the PDFium project.
args.append('--depth=' + os.path.relpath(pdfium_root))
+ # GYP does not default to ninja, but PDFium should.
+ if not os.environ.get('GYP_GENERATORS', ''):
+ print 'GYP_GENERATORS is not set, defaulting to ninja'
+ os.environ['GYP_GENERATORS'] = 'ninja'
+
print 'Updating projects from gyp files...'
sys.stdout.flush()
@@ -44,4 +49,4 @@ def main():
if __name__ == '__main__':
- sys.exit(main()) \ No newline at end of file
+ sys.exit(main())