Index: content/content.gyp |
diff --git a/content/content.gyp b/content/content.gyp |
index f7902796b29e3a0f3ae0477f60b289d28e7308ce..e6cabb79535889542c2367c6e8b61456a674753c 100644 |
--- a/content/content.gyp |
+++ b/content/content.gyp |
@@ -6,22 +6,10 @@ |
'variables': { |
'chromium_code': 1, # Use higher warning level. |
'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', |
- 'conditions': [ |
- ['inside_chromium_build==0', { |
- 'webkit_src_dir': '../../../..', |
- },{ |
- 'webkit_src_dir': '../third_party/WebKit', |
- }], |
- ], |
}, |
'target_defaults': { |
'defines': ['CONTENT_IMPLEMENTATION'], |
'conditions': [ |
- ['inside_chromium_build==0', { |
- 'dependencies': [ |
- '../webkit/support/setup_third_party.gyp:third_party_headers', |
- ], |
- }], |
# TODO(jschuh): Remove this after crbug.com/173851 gets fixed. |
['OS=="win" and target_arch=="x64"', { |
'msvs_settings': { |
@@ -33,15 +21,11 @@ |
], |
}, |
'conditions': [ |
- ['inside_chromium_build==1', { |
- 'includes': [ |
- 'content_tests.gypi', |
- ], |
- }], |
['OS != "ios"', { |
'includes': [ |
'../build/win_precompile.gypi', |
'content_shell.gypi', |
+ 'content_tests.gypi', |
], |
}], |
# In component mode, we build all of content as a single DLL. |