summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/android_webview.gyp2
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--chrome/chrome_browser_chromeos.gypi2
-rw-r--r--chrome/chrome_browser_extensions.gypi2
-rw-r--r--chrome/chrome_browser_ui.gypi2
-rw-r--r--chrome/chrome_dll.gypi2
-rw-r--r--chrome/chrome_renderer.gypi2
-rw-r--r--chrome/chrome_resources.gyp4
-rw-r--r--chrome/chrome_tests.gypi2
-rw-r--r--chrome/chrome_tests_unit.gypi2
-rw-r--r--components/autofill.gypi4
-rw-r--r--content/content_browser.gypi4
-rw-r--r--content/content_shell.gypi8
-rw-r--r--content/content_tests.gypi4
-rw-r--r--webkit/common/webkit_common.gyp2
-rw-r--r--webkit/glue/webkit_glue.gypi27
-rw-r--r--webkit/webkit_resources.gyp23
17 files changed, 41 insertions, 53 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 0dcf2c1..785d70c 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -31,7 +31,7 @@
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
],
'variables': {
'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2e42690..f456632 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2409,7 +2409,7 @@
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
'../webkit/support/webkit_support.gyp:glue_common',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'defines': [
'<@(nacl_defines)',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index ac0cbec..cb60751 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -93,7 +93,7 @@
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
'../webkit/support/webkit_support.gyp:glue',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
'chrome_resources.gyp:chrome_strings',
],
'defines': [
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 0aa9476..0201610 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -46,7 +46,7 @@
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
'../webkit/support/webkit_support.gyp:glue',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 9cc9669..682449d0 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2405,7 +2405,7 @@
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
'../webkit/support/webkit_support.gyp:glue',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'defines': [
'<@(nacl_defines)',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 2510ec6..ecd10bf 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -111,7 +111,7 @@
'../net/net.gyp:net_resources',
'../third_party/cld/cld.gyp:cld',
'../ui/views/views.gyp:views',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'sources': [
'app/chrome_command_ids.h',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index d068d53..d1b425d 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -32,7 +32,7 @@
'../webkit/support/webkit_support.gyp:glue_renderer',
'../webkit/support/webkit_support.gyp:plugins',
'../webkit/support/webkit_support.gyp:webkit_media',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index e41e303..e65f2d0 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -350,8 +350,8 @@
'<(DEPTH)/ash/ash_strings.gyp:ash_strings',
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
],
}],
['use_ash==1', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9ec897a..a0868f8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -195,7 +195,7 @@
# Runtime dependencies
'../ppapi/ppapi_internal.gyp:ppapi_tests',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 1a90cd9..61b22d1 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1920,7 +1920,7 @@
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/plugins/webkit_plugins.gyp:test_mock_plugin_list',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
# TODO(scr): Use this in browser_tests too.
'includes': [
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 45f740d..021163a 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -110,7 +110,7 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
'component_strings.gyp:component_strings',
],
@@ -265,7 +265,7 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
'component_strings.gyp:component_strings',
],
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index a6dfa87..52363a6 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1175,8 +1175,8 @@
'../webkit/common/webkit_common.gyp:webkit_common',
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
- '../webkit/webkit_resources.gyp:webkit_temp_strings',
+ '../webkit/webkit_resources.gyp:webkit_resources',
+ '../webkit/webkit_resources.gyp:webkit_strings',
],
}],
['OS!="mac" and OS!="ios"', {
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index bfe11b8..1568617 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -52,7 +52,7 @@
'../url/url.gyp:url_lib',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:webkit_support',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
@@ -174,7 +174,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
'dependencies': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
],
'configurations': {
'Debug_Base': {
@@ -294,8 +294,8 @@
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
],
'conditions': [
['OS!="android" and OS!="ios"', {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e2f390e..a0c595f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -892,8 +892,8 @@
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
],
'configurations': {
'Debug_Base': {
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index 255ed75..ba8b3ab 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -24,7 +24,7 @@
'<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index a8e67ad..ce719d0 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -214,8 +214,8 @@
'<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
'<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
'<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
'glue_common',
'plugins',
'webkit_media',
@@ -285,29 +285,6 @@
}],
],
},
-
-# TODO(jamesr): These temporary targets exist only for DumpRenderTree.gyp in the blink repo.
- {
- 'target_name': 'webkit_resources',
- 'type': 'none',
- 'dependencies': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- ],
- 'export_dependent_settings': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- ],
- },
-
- {
- 'target_name': 'webkit_strings',
- 'type': 'none',
- 'dependencies': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
- ],
- 'export_dependent_settings': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
- ],
- },
],
'conditions': [
['use_third_party_translations==1', {
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index c6f1eff..e386cef 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -4,17 +4,15 @@
{
'targets': [
-# TODO(jamesr): These targets should be called webkit_(resources|strings), but can't
-# until blink is updated.
{
- 'target_name': 'webkit_temp_resources',
+ 'target_name': 'webkit_resources',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
},
'actions': [
{
- 'action_name': 'webkit_temp_resources',
+ 'action_name': 'webkit_resources',
'variables': {
'grit_grd_file': 'glue/resources/webkit_resources.grd',
},
@@ -34,14 +32,14 @@
},
},
{
- 'target_name': 'webkit_temp_strings',
+ 'target_name': 'webkit_strings',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
},
'actions': [
{
- 'action_name': 'webkit_temp_strings',
+ 'action_name': 'webkit_strings',
'variables': {
'grit_grd_file': 'glue/webkit_strings.grd',
},
@@ -50,6 +48,19 @@
],
'includes': [ '../build/grit_target.gypi' ],
},
+# TODO(jamesr): Remove these once blink depends on the real targets.
+ {
+ 'target_name': 'webkit_temp_resources',
+ 'type': 'none',
+ 'dependencies': [ 'webkit_resources' ],
+ 'export_dependent_settings': [ 'webkit_resources' ],
+ },
+ {
+ 'target_name': 'webkit_temp_strings',
+ 'type': 'none',
+ 'dependencies': [ 'webkit_strings' ],
+ 'export_dependent_settings': [ 'webkit_strings' ],
+ },
]
}
generated by cgit v1.1 at 2025-03-10 02:37:24 +0000