Skip to content
Permalink
Browse files
2010-07-19 Tony Chang <tony@chromium.org>
        Reviewed by Kent Tamura.

        [chromium] refactor npapi plugin copy step
        https://bugs.webkit.org/show_bug.cgi?id=42493

        This is to avoid duplicate copy rules in the Linux make build.

        * WebKit.gyp:
        * DEPS: 52483:52869

Canonical link: https://commits.webkit.org/54516@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
idealisms committed Jul 19, 2010
1 parent fd841ef commit 9d6e79579d72f830b14ea0bad1b5d100a8cc10eb
Showing 3 changed files with 16 additions and 19 deletions.
@@ -1,3 +1,15 @@
2010-07-19 Tony Chang <tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] refactor npapi plugin copy step
https://bugs.webkit.org/show_bug.cgi?id=42493

This is to avoid duplicate copy rules in the Linux make build.

* WebKit.gyp:
* DEPS: 52483:52869

2010-07-19 Ilya Tikhonovsky <loislo@chromium.org>

Reviewed by Pavel Feldman.
@@ -32,7 +32,7 @@

vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
'chromium_rev': '52483',
'chromium_rev': '52869',
}

deps = {
@@ -89,6 +89,8 @@ deps = {
Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
'media':
Var('chromium_svn')+'/media@'+Var('chromium_rev'),
'printing':
Var('chromium_svn')+'/printing@'+Var('chromium_rev'),
'third_party/angle': # needed by the gpu process
From('chromium_deps', 'src/third_party/angle'),
'third_party/ffmpeg': # needed by webkit/media
@@ -731,7 +731,7 @@
'webkit',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
'<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib'
],
@@ -777,16 +777,6 @@
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': ['<(ahem_path)'],
}, {
# This should really be done in the 'npapi_layout_test_plugin'
# target, but the current VS generator handles 'copies'
# settings as AdditionalDependencies, which means that
# when it's over there, it tries to do the copy *before*
# the file is built, instead of after. We work around this
# by attaching the copy here, since it depends on that
# target.
'destination': '<(PRODUCT_DIR)/plugins',
'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
}],
},{ # OS!="win"
'sources/': [
@@ -831,10 +821,6 @@
'../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
'<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
],
'copies': [{
'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/PlugIns/',
'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
}],
},{ # OS!="mac"
'sources/': [
# .mm is already excluded by common.gypi
@@ -849,9 +835,6 @@
'../../WebKitTools/DumpRenderTree/chromium/fonts.conf',
'<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
]
}, {
'destination': '<(PRODUCT_DIR)/plugins',
'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
}],
},{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"
'sources/': [

0 comments on commit 9d6e795

Please sign in to comment.