Index: chrome/chrome_exe.gypi |
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi |
index ae000d7dc7f159042e1860b4a3f50bdd0e39e1b9..9ebbf22b2dc6b815b926abd51b7446fb3b203549 100644 |
--- a/chrome/chrome_exe.gypi |
+++ b/chrome/chrome_exe.gypi |
@@ -26,7 +26,9 @@ |
'app/hard_error_handler_win.h', |
'app/metro_driver_win.cc', |
'app/metro_driver_win.h', |
- '../content/app/startup_helper_win.cc', |
+ '<(DEPTH)/content/app/startup_helper_win.cc', |
+ '<(DEPTH)/content/public/common/content_switches.cc', |
+ '<(DEPTH)/content/public/common/content_switches.h', |
], |
'mac_bundle_resources': [ |
'app/app-Info.plist', |
@@ -567,7 +569,6 @@ |
'../content/app/startup_helper_win.cc', |
'../content/common/sandbox_init_win.cc', |
'../content/common/sandbox_win.cc', |
- '../content/public/common/content_switches.cc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', |
], |
'dependencies': [ |
@@ -581,6 +582,7 @@ |
'../base/base.gyp:base_static_win64', |
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', |
'../components/components.gyp:breakpad_win64', |
+ '../content/content.gyp:content_common', |
Rafał Chłodnicki
2013/10/01 18:38:17
Alternatively I could just add content_switches to
jam
2013/10/03 00:34:36
probably best to leave as before (i.e. pulling in
Rafał Chłodnicki
2013/10/03 08:33:55
Done.
|
'../chrome/common_constants.gyp:common_constants_win64', |
'../components/nacl.gyp:nacl_win64', |
'../crypto/crypto.gyp:crypto_nacl_win64', |