Use system icu

This adds system icu headers.

Change-Id: I4eb5f1c0e4d96719f33334b650f38343b429e6bb
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/atom/renderer/api/atom_api_spell_check_client.cc b/atom/renderer/api/atom_api_spell_check_client.cc
index 9a07cbf..edfdd0d 100644 (file)
--- a/atom/renderer/api/atom_api_spell_check_client.cc
+++ b/atom/renderer/api/atom_api_spell_check_client.cc
@@ -11,7 +11,11 @@
 #include "base/logging.h"
 #include "native_mate/converter.h"
 #include "native_mate/dictionary.h"
+#if defined(USE_SYSTEM_ICU)
+#include "unicode/uscript.h"
+#else
 #include "third_party/icu/source/common/unicode/uscript.h"
+#endif
 #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 

diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
index 46465f4..2aa8beb 100644 (file)
--- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
+++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
@@ -13,11 +13,17 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#if defined(USE_SYSTEM_ICU)
+#include "unicode/normlzr.h"
+#include "unicode/schriter.h"
+#include "unicode/uscript.h"
+#include "unicode/ulocdata.h"
+#else
 #include "third_party/icu/source/common/unicode/normlzr.h"
 #include "third_party/icu/source/common/unicode/schriter.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "third_party/icu/source/i18n/unicode/ulocdata.h"
-
+#endif
 // SpellcheckCharAttribute implementation:
 
 SpellcheckCharAttribute::SpellcheckCharAttribute()

diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
index 7e07d29..4efc881 100644 (file)
--- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
+++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
@@ -14,7 +14,12 @@
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
+
+#if defined(USE_SYSTEM_ICU)
+#include "unicode/uscript.h"
+#else
 #include "third_party/icu/source/common/unicode/uscript.h"
+#endif
 
 namespace base {
 namespace i18n {

diff --git a/electron.gyp b/electron.gyp
index fa56224..847870b 100644 (file)
--- a/electron.gyp
+++ b/electron.gyp
@@ -365,6 +365,9 @@
             '<(DEPTH)/efl/build/system.gyp:icu',
             'electron_shell_copy',
           ],
+          'defines': [
+            'USE_SYSTEM_ICU',
+          ],
           'sources': [
             'chromium_src/chrome/browser/icon_loader_efllinux.cc',
           ],