chromium/src
0
Fork 0
Code Activity

Allow for building content_shell from within WebKit

Browse Source 
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10388218

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138231 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jochen@chromium.org
2012-05-22 07:38:52 +00:00
parent e5b7f0e9e4
commit ee582a571a
9 changed files with 41 additions and 9 deletions

11
content/browser/debugger/devtools_resources.gyp

@ -3,12 +3,21 @@
# found in the LICENSE file.
{
'variables': {
'conditions': [
['inside_chromium_build==0', {
'webkit_src_dir': '../../../../../..',
},{
'webkit_src_dir': '../../../third_party/WebKit',
}],
],
},
'targets': [
{
'target_name': 'devtools_resources',
'type': 'none',
'dependencies': [
'../../../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
],
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',

20
content/content.gyp

@ -6,16 +6,34 @@
'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',
}],
],
},
'includes': [
'../build/win_precompile.gypi',
'content_shell.gypi',
'content_tests.gypi',
],
'target_defaults': {
'defines': ['CONTENT_IMPLEMENTATION'],
'conditions': [
['inside_chromium_build==0', {
'dependencies': [
'../webkit/support/setup_third_party.gyp:third_party_headers',
],
}],
],
},
'conditions': [
['inside_chromium_build==1', {
'includes': [
'content_tests.gypi',
]
}],
# In component mode, we build all of content as a single DLL.
# However, in the static mode, we need to build content as multiple
# targets in order to prevent dependencies from getting introduced

2
content/content_browser.gypi

@ -14,7 +14,7 @@
'../skia/skia.gyp:skia',
'../third_party/flac/flac.gyp:libflac',
'../third_party/speex/speex.gyp:libspeex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',

2
content/content_common.gypi

@ -14,7 +14,7 @@
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../webkit/support/webkit_support.gyp:appcache',

2
content/content_renderer.gypi

@ -15,7 +15,7 @@
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:webkit_media',

2
content/content_shell.gypi

@ -33,7 +33,7 @@
'../media/media.gyp:media',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/ui.gyp:ui',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:appcache',

4
content/content_tests.gypi

@ -16,7 +16,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui_test_support',
'../webkit/support/webkit_support.gyp:appcache',
@ -184,7 +184,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../v8/tools/gyp/v8.gyp:v8',

2
content/content_worker.gypi

@ -6,7 +6,7 @@
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
'worker/shared_worker_devtools_agent.cc',

5
tools/gritsettings/resource_ids

@ -136,9 +136,14 @@
"includes": [20000],
},
# This file is generated during the build.
# devtools_resources.grd can be in two different places depending on whether
# we are in a chromium checkout or a webkit-only checkout.
"<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
"includes": [20500],
},
"devtools_resources.grd": {
"includes": [20500],
},
# All standard and large theme resources should have the same IDs.
"chrome/app/theme/theme_resources_standard.grd": {
"includes": [21000],