diff options
| -rw-r--r-- | build/exclude_chromium_sources.gypi | 13 | ||||
| -rwxr-xr-x | build/gyp_blinq | 3 | ||||
| -rw-r--r-- | patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch | 38 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
4 files changed, 16 insertions, 39 deletions
diff --git a/build/exclude_chromium_sources.gypi b/build/exclude_chromium_sources.gypi new file mode 100644 index 000000000..9d20912b2 --- /dev/null +++ b/build/exclude_chromium_sources.gypi @@ -0,0 +1,13 @@ +{ + 'target_defaults': { + # patterns used to exclude chromium files from the build when we have a drop-in replacement + 'sources/': [ + ['exclude', 'shell/shell_gtk\\.cc$'], + ['exclude', 'shell/shell_mac\\.mm$'], + ['exclude', 'shell/shell_win\\.cc$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_gtk\\.(cc|h)$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_mac.*\\.(mm|h)$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_win.*\\.(cc|h)$'], + ], + } +} diff --git a/build/gyp_blinq b/build/gyp_blinq index c2b4cd453..a7eff0d6f 100755 --- a/build/gyp_blinq +++ b/build/gyp_blinq @@ -47,6 +47,9 @@ def additional_include_files(args=[]): # Always include common.gypi. AddInclude(os.path.join(script_dir, 'common.gypi')) + # Files to exclude from the chromium build. + AddInclude(os.path.join(os.getcwd(), 'exclude_chromium_sources.gypi')) + # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) for supplement in supplements: diff --git a/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch b/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch deleted file mode 100644 index 5edc125a6..000000000 --- a/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d3fe2537f911599cdddb8ffc31bdcf8e2a0bad9d Mon Sep 17 00:00:00 2001 -From: Zeno Albisser <zeno@webkit.org> -Date: Tue, 14 May 2013 10:52:58 +0200 -Subject: [PATCH] Exclude some Gtk files from the chromium build. - ---- - content/content_browser.gypi | 2 -- - content/content_shell.gypi | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/content/content_browser.gypi b/content/content_browser.gypi -index 4627a4e..49eefe7 100644 ---- a/content/content_browser.gypi -+++ b/content/content_browser.gypi -@@ -831,8 +831,6 @@ - 'browser/renderer_host/render_widget_host_view_aura.h', - 'browser/renderer_host/render_widget_host_view_base.cc', - 'browser/renderer_host/render_widget_host_view_base.h', -- 'browser/renderer_host/render_widget_host_view_gtk.cc', -- 'browser/renderer_host/render_widget_host_view_gtk.h', - 'browser/renderer_host/render_widget_host_view_guest.cc', - 'browser/renderer_host/render_widget_host_view_guest.h', - 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h', -diff --git a/content/content_shell.gypi b/content/content_shell.gypi -index 122e56b..e8271b6 100644 ---- a/content/content_shell.gypi -+++ b/content/content_shell.gypi -@@ -94,7 +94,6 @@ - 'shell/shell.h', - 'shell/shell_android.cc', - 'shell/shell_aura.cc', -- 'shell/shell_gtk.cc', - 'shell/shell_mac.mm', - 'shell/shell_win.cc', - 'shell/shell_application_mac.h', --- -1.8.1.2 - diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index ce8a6c716..cb74fecc1 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -21,7 +21,6 @@ fi echo "Applying patches..." git am $PATCH_DIR/0001-My-local-fixes.patch -git am $PATCH_DIR/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch cd tools/gyp echo "Entering $PWD" |