From c3301a197e611f1de3deb66267cfbc0202aaf439 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 29 Jun 2014 19:13:49 +0800 Subject: [PATCH] Fix including gtk rules in other OSs. --- atom.gyp | 2 +- chromium_src/ui/gfx/{gfx_gtk_util.cc => gtk_util_gfx.cc} | 0 filename_rules.gypi | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) rename chromium_src/ui/gfx/{gfx_gtk_util.cc => gtk_util_gfx.cc} (100%) diff --git a/atom.gyp b/atom.gyp index 58b75236992..d067b46560a 100644 --- a/atom.gyp +++ b/atom.gyp @@ -255,7 +255,7 @@ 'chromium_src/ui/base/x/x11_util.cc', 'chromium_src/ui/events/keycodes/keyboard_code_conversion_gtk.cc', 'chromium_src/ui/events/keycodes/keyboard_code_conversion_gtk.h', - 'chromium_src/ui/gfx/gfx_gtk_util.cc', + 'chromium_src/ui/gfx/gtk_util_gfx.cc', 'chromium_src/ui/gfx/gtk_util.h', '<@(native_mate_files)', ], diff --git a/chromium_src/ui/gfx/gfx_gtk_util.cc b/chromium_src/ui/gfx/gtk_util_gfx.cc similarity index 100% rename from chromium_src/ui/gfx/gfx_gtk_util.cc rename to chromium_src/ui/gfx/gtk_util_gfx.cc diff --git a/filename_rules.gypi b/filename_rules.gypi index 87ab6081934..03008056462 100644 --- a/filename_rules.gypi +++ b/filename_rules.gypi @@ -33,6 +33,7 @@ 'sources/': [ ['exclude', '_linux(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)linux/'], + ['exclude', '(^|/)linux/'], ], }], ['OS!="android"', { @@ -57,6 +58,8 @@ ['exclude', '_gtk(_browsertest|_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)gtk/'], ['exclude', '(^|/)gtk_[^/]*\\.(h|cc)$'], + ['exclude', '(^|/)libgtk2ui/'], + ['exclude', '(^|/)x/'], ], }], ['OS!="win"', {