summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/android_webview.gyp1
-rw-r--r--chrome/chrome_dll.gypi1
-rw-r--r--chrome/chrome_repack_chrome.gypi1
-rw-r--r--chrome/chrome_tests.gypi4
-rw-r--r--chrome/chrome_tests_unit.gypi1
-rw-r--r--chrome/test/gpu/test_support_gpu.gypi1
-rw-r--r--content/DEPS1
-rw-r--r--content/browser/gpu/test_support_gpu.gypi1
-rw-r--r--content/content_shell.gypi1
-rw-r--r--content/content_tests.gypi1
-rw-r--r--tools/gritsettings/resource_ids9
-rw-r--r--webkit/webkit_resources.gyp9
12 files changed, 24 insertions, 7 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 827ff41..ddbd1b8 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -53,6 +53,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index a5a8bb9..9c0e15d 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -147,6 +147,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'include_dirs': [
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 33bdd8a..80683c5 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -15,6 +15,7 @@
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
],
}],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 36c9090..fe5ade0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -452,6 +452,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
@@ -1926,6 +1927,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'include_dirs': [
@@ -2164,6 +2166,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'include_dirs': [
@@ -2547,6 +2550,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'include_dirs': [
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index bb83f50..f728b8c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2339,6 +2339,7 @@
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'link_settings': {
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 7a96dc3..4be0e525 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -59,6 +59,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'conditions': [
diff --git a/content/DEPS b/content/DEPS
index 08aa6db..f57609a 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -27,6 +27,7 @@ include_rules = [
"-cc/base/scoped_ptr_vector.h",
"+crypto",
+ "+grit/blink_resources.h",
"+grit/content_resources.h",
"+grit/ui_resources.h",
"+grit/ui_strings.h",
diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
index 9ec697b..f141069 100644
--- a/content/browser/gpu/test_support_gpu.gypi
+++ b/content/browser/gpu/test_support_gpu.gypi
@@ -28,6 +28,7 @@
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
],
'conditions': [
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4d120af..4344257 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -319,6 +319,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b92c4452..ed23898 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -894,6 +894,7 @@
# but that causes errors in other targets when
# resulting .res files get referenced multiple times.
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
],
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index fdab9ca..8000821 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -66,15 +66,9 @@
"chrome_frame/resources/chrome_frame_resources.grd": {
"includes": [8000],
},
- # WebKit.grd can be in two different places depending on whether we are
- # in a chromium checkout or a webkit-only checkout.
"third_party/WebKit/Source/WebKit/chromium/WebKit.grd": {
"includes": [8500],
},
- "WebKit.grd": {
- "includes": [8500],
- },
-
"ui/base/strings/app_locale_settings.grd": {
"messages": [9000],
},
@@ -223,5 +217,8 @@
"components/component_strings.grd": {
"messages": [30000],
},
+ "third_party/WebKit/public/blink_resources.grd": {
+ "includes": [30500],
+ },
# Resource ids starting at 31000 are reserved for projects built on Chromium.
}
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index 3d486e9..50f795e 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -19,12 +19,19 @@
'includes': [ '../build/grit_action.gypi' ],
},
{
- 'action_name': 'blink_chromium_resources',
+ 'action_name': 'webkit_chromium_resources',
'variables': {
'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
+ {
+ 'action_name': 'blink_chromium_resources',
+ 'variables': {
+ 'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
],
'includes': [ '../build/grit_target.gypi' ],
'direct_dependent_settings': {
generated by cgit v1.1 at 2025-01-30 23:44:44 +0000