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

Unified Diff: build/common.gypi

Issue 10031014: The Chrome Remote Desktop installation for Windows can be build by bots now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a typo. Created 8 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/all.gyp ('k') | chrome/tools/build/win/FILES.cfg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9dec996c5c91b06af751f41603d4b31ba6cbd7f4..1c17edd1813419fdde9dbd78b32bf4f9f31c6a48 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -302,6 +302,9 @@
# Force rlz to use chrome's networking stack.
'force_rlz_use_chrome_net%': 1,
+ 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files',
+ 'wix_path%': '<(DEPTH)/third_party/wix',
+
'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and
@@ -523,6 +526,8 @@
'enable_automation%': '<(enable_automation)',
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
'enable_task_manager%': '<(enable_task_manager)',
+ 'platformsdk_path%': '<(platformsdk_path)',
+ 'wix_path%': '<(wix_path)',
# Use system yasm instead of bundled one.
'use_system_yasm%': 0,
@@ -751,6 +756,9 @@
# Native Client is enabled by default.
'disable_nacl%': 0,
+ 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_path))',
+ 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
+
'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
« no previous file with comments | « build/all.gyp ('k') | chrome/tools/build/win/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698