Index: build/gyp_chromium |
diff --git a/build/gyp_chromium b/build/gyp_chromium |
index b06552db32ba7b7e4ac56073487ad9493a8e5161..66ef75d16466b5ea00f77ffbb3739a45065df4b0 100755 |
--- a/build/gyp_chromium |
+++ b/build/gyp_chromium |
@@ -550,12 +550,14 @@ if __name__ == '__main__': |
'GYP_CROSSCOMPILE' not in os.environ)): |
os.environ['GYP_CROSSCOMPILE'] = '1' |
- if not RunGN(gn_vars_dict): |
- sys.exit(1) |
+ if not 'android_webview_build=1' in os.environ.get('GYP_DEFINES', []): |
+ if not RunGN(gn_vars_dict): |
+ sys.exit(1) |
+ |
Yang Gu
2014/03/13 10:07:29
We don't need to run gn and landmines.py (below) f
Torne
2014/03/13 11:04:46
No, we can't just skip running gn for the webview
Yang Gu
2014/03/13 16:06:07
gn is quite a new thing to me and thanks a lot for
Torne
2014/03/17 15:28:14
No, what I suggested is that you wait until after
|
args.extend( |
['-I' + i for i in additional_include_files(supplemental_includes, args)]) |
- args.extend(['-D', 'gyp_output_dir=' + GetOutputDirectory()]) |
+ args.extend(['-Dgyp_output_dir=' + GetOutputDirectory()]) |
Yang Gu
2014/03/13 10:07:29
This is to unify the format of parameter to be -Dx
|
print 'Updating projects from gyp files...' |
sys.stdout.flush() |
@@ -566,9 +568,10 @@ if __name__ == '__main__': |
# Check for landmines (reasons to clobber the build). This must be run here, |
# rather than a separate runhooks step so that any environment modifications |
# from above are picked up. |
- print 'Running build/landmines.py...' |
- subprocess.check_call( |
- [sys.executable, os.path.join(script_dir, 'landmines.py')]) |
+ if not 'android_webview_build=1' in os.environ.get('GYP_DEFINES', []): |
Torne
2014/03/13 11:04:46
Why do you need to disable running landmines? We'v
Yang Gu
2014/03/13 16:06:07
yes, this part doesn't hurt (except speed:)), and
Torne
2014/03/17 15:28:14
I'm not sure what you mean here. If there's no nee
|
+ print 'Running build/landmines.py...' |
+ subprocess.check_call( |
+ [sys.executable, os.path.join(script_dir, 'landmines.py')]) |
if vs2013_runtime_dll_dirs: |
x64_runtime, x86_runtime = vs2013_runtime_dll_dirs |