Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: third_party/ced/ced.gyp

Issue 2168003003: Replace ICU encoding detection with CED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments/add datafiles back Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/ced/ced.gyp
diff --git a/third_party/ced/ced.gyp b/third_party/ced/ced.gyp
index cb42521485873106b6cb12343d8e00bd8f82df72..1123752913dd6ba8bc3a6376eca0bf0dcf25a3d8 100644
--- a/third_party/ced/ced.gyp
+++ b/third_party/ced/ced.gyp
@@ -4,6 +4,7 @@
{
'includes': [
+ 'ced.gypi',
'../../build/win_precompile.gypi',
],
'targets': [
@@ -14,26 +15,7 @@
'src',
],
'sources': [
- "src/compact_enc_det/compact_enc_det.cc",
- "src/compact_enc_det/compact_enc_det.h",
- "src/compact_enc_det/compact_enc_det_generated_tables.h",
- "src/compact_enc_det/compact_enc_det_generated_tables2.h",
- "src/compact_enc_det/compact_enc_det_hint_code.cc",
- "src/compact_enc_det/compact_enc_det_hint_code.h",
- "src/compact_enc_det/detail_head_string.inc",
- "src/util/basictypes.h",
- "src/util/build_config.h",
- "src/util/commandlineflags.h",
- "src/util/encodings/encodings.cc",
- "src/util/encodings/encodings.h",
- "src/util/encodings/encodings.pb.h",
- "src/util/languages/languages.cc",
- "src/util/languages/languages.h",
- "src/util/languages/languages.pb.h",
- "src/util/logging.h",
- "src/util/port.h",
- "src/util/string_util.h",
- "src/util/varsetter.h",
+ '<@(ced_sources)',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -41,6 +23,9 @@
],
},
'conditions': [
+ ['OS == "ios"', {
+ 'toolsets': ['host', 'target'],
+ }],
['OS=="win"', {
'direct_dependent_settings': {
'defines': [
@@ -69,8 +54,10 @@
'<(DEPTH)',
],
'sources': [
- "src/compact_enc_det/compact_enc_det_fuzz_test.cc",
- "src/compact_enc_det/compact_enc_det_unittest.cc",
+ 'src/compact_enc_det/compact_enc_det_fuzz_test.cc',
+ 'src/compact_enc_det/compact_enc_det_unittest.cc',
+ 'src/compact_enc_det/detail_head_string.inc',
+ 'src/util/encodings/encodings_unittest.cc',
],
},
],

Powered by Google App Engine
This is Rietveld 408576698