summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.gypi
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 17:40:42 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 17:40:42 +0000
commit0bad9b1895f6f0264527a9986044d9d1ee9152b1 (patch)
tree22a7464cbac92e2ee86c71ffc44ef580b7637963 /webkit/glue/webkit_glue.gypi
parentd201b200e947d18ede55706197c62dbaeace8d5f (diff)
downloadchromium_src-0bad9b1895f6f0264527a9986044d9d1ee9152b1.zip
chromium_src-0bad9b1895f6f0264527a9986044d9d1ee9152b1.tar.gz
chromium_src-0bad9b1895f6f0264527a9986044d9d1ee9152b1.tar.bz2
Revert 57692 - Factoring BuildUserAgent out to a separate lib for GCF can use it.
TEST=There should be no functional change. If anything breaks it should be the build. BUG=50788 Review URL: http://codereview.chromium.org/3214005 TBR=tommi@chromium.org Review URL: http://codereview.chromium.org/3275001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.gypi')
-rw-r--r--webkit/glue/webkit_glue.gypi43
1 files changed, 11 insertions, 32 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index a23ed53..450a870 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -105,37 +105,6 @@
],
},
{
- 'target_name': 'webkit_user_agent',
- 'type': '<(library)',
- 'msvs_guid': 'DB162DE1-7D56-4C4A-8A9F-80D396CD7AA8',
- 'dependencies': [
- '<(DEPTH)/app/app.gyp:app_base',
- '<(DEPTH)/base/base.gyp:base_i18n',
- ],
- 'actions': [
- {
- 'action_name': 'webkit_version',
- 'inputs': [
- '../build/webkit_version.py',
- '<(webkit_src_dir)/WebCore/Configurations/Version.xcconfig',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/webkit_version.h',
- ],
- 'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
- },
- ],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)',
- ],
- 'sources': [
- 'user_agent.cc',
- 'user_agent.h',
- ],
- 'conditions': [
- ],
- },
- {
'target_name': 'glue',
'type': '<(library)',
'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
@@ -152,9 +121,19 @@
'<(DEPTH)/third_party/ppapi/ppapi.gyp:ppapi_c',
'webkit_resources',
'webkit_strings',
- 'webkit_user_agent',
],
'actions': [
+ {
+ 'action_name': 'webkit_version',
+ 'inputs': [
+ '../build/webkit_version.py',
+ '<(webkit_src_dir)/WebCore/Configurations/Version.xcconfig',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/webkit_version.h',
+ ],
+ 'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
+ },
],
'include_dirs': [
'<(INTERMEDIATE_DIR)',