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

Unified Diff: build/gyp_crashpad.py

Issue 1349313003: win: support x64 reading x86 (wow64) (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: mac Created 5 years, 3 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 | « no previous file | build/run_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gyp_crashpad.py
diff --git a/build/gyp_crashpad.py b/build/gyp_crashpad.py
index 8e342ffd7154b2868687dac89cef3b3bc5107b56..42818eca01b35a16b0194f2138041bbb9dd5a3c8 100755
--- a/build/gyp_crashpad.py
+++ b/build/gyp_crashpad.py
@@ -24,6 +24,7 @@ sys.path.insert(
import gyp
+
def main(args):
if 'GYP_GENERATORS' not in os.environ:
os.environ['GYP_GENERATORS'] = 'ninja'
@@ -31,16 +32,25 @@ def main(args):
crashpad_dir_or_dot = crashpad_dir if crashpad_dir is not '' else '.'
args.extend(['-D', 'crashpad_standalone=1'])
- args.extend(['--include', os.path.join(crashpad_dir,
- 'third_party',
- 'mini_chromium',
- 'mini_chromium',
- 'build',
- 'common.gypi')])
+ args.extend(['--include',
+ os.path.join(crashpad_dir, 'third_party', 'mini_chromium',
+ 'mini_chromium', 'build', 'common.gypi')])
args.extend(['--depth', crashpad_dir_or_dot])
args.append(os.path.join(crashpad_dir, 'crashpad.gyp'))
- return gyp.main(args)
+ result = gyp.main(args)
+ if result != 0:
+ return result
+
+ if sys.platform == 'win32':
+ # Also generate the x86 build.
+ result = gyp.main(args + ['-D', 'target_arch=ia32', '-G', 'config=Debug'])
+ if result != 0:
+ return result
+ result = gyp.main(args + ['-D', 'target_arch=ia32', '-G', 'config=Release'])
+
+ return result
+
if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))
« no previous file with comments | « no previous file | build/run_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698