Refactor language detection logic to allow non-static CLD data sources.

third_party/cld_2/cld_2.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Note to maintainers: In the January 2014 release (*_0122*), there are some
 # options for building:
 # Pick one quadgram file (cld2_generated_quadchrome*.cc):
 #   0122_16 = 160K entries, smallest size, lowest accuracy (set cld2_table_size=0)
 #   0122_19 = 192K entries, medium size, medium accuracy (set cld2_table_size=1)
 #   0122_2  = 256K entries, largest size, highest accuracy (set cld2_table_size=2)
@@ skipping 16 matching lines @@
     # well as the dynamic data tool.
     'cld2_core_sources': [
       'src/internal/cld2tablesummary.h',
       'src/internal/cldutil.cc',
       'src/internal/cldutil.h',
       'src/internal/cldutil_shared.cc',
       'src/internal/cldutil_shared.h',
       'src/internal/compact_lang_det.cc',
       'src/internal/compact_lang_det_hint_code.cc',
       'src/internal/compact_lang_det_hint_code.h',
-      'src/internal/compact_lang_det_impl.cc',
+      # Omitted intentionally: compact_lang_det_impl.cc, which has IFDEFs that
+      # depend upon build flags. See cld2_core_impl_sources, below.
       'src/internal/compact_lang_det_impl.h',
       'src/internal/debug.h',
       'src/internal/debug_empty.cc',
       'src/internal/fixunicodevalue.cc',
       'src/internal/fixunicodevalue.h',
       'src/internal/generated_distinct_bi_0.cc',
       'src/internal/generated_entities.cc',
       'src/internal/generated_language.cc',
       'src/internal/generated_language.h',
       'src/internal/generated_ulscript.cc',
@@ skipping 13 matching lines @@
       'src/internal/tote.cc',
       'src/internal/tote.h',
       'src/internal/utf8prop_lettermarkscriptnum.h',
       'src/internal/utf8repl_lettermarklower.h',
       'src/internal/utf8scannot_lettermarkspecial.h',
       'src/internal/utf8statetable.cc',
       'src/internal/utf8statetable.h',
       'src/public/compact_lang_det.h',
       'src/public/encodings.h',
     ],
+    'cld2_core_impl_sources': [
+      # Compilation is dependent upon flags.
+      'src/internal/compact_lang_det_impl.cc',
+    ],
     'cld2_dynamic_data_loader_sources': [
       'src/internal/cld2_dynamic_data.h',
       'src/internal/cld2_dynamic_data.cc',
       'src/internal/cld2_dynamic_data_loader.h',
       'src/internal/cld2_dynamic_data_loader.cc',
     ],
     'cld2_data_sources': [
       'src/internal/cld2_generated_cjk_compatible.cc',
       'src/internal/cld2_generated_deltaoctachrome0122.cc',
       'src/internal/cld2_generated_distinctoctachrome0122.cc',
@@ skipping 20 matching lines @@
       # GN version: //third_party/cld_2
       'target_name': 'cld_2_dynamic_data_tool',
       'type': 'executable',
       'include_dirs': [
         'src/internal',
         'src/public',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         '<@(cld2_core_sources)',
+        '<@(cld2_core_impl_sources)',
         '<@(cld2_data_sources)',
         '<@(cld2_dynamic_data_loader_sources)',
         'src/internal/cld2_dynamic_data_extractor.h',
         'src/internal/cld2_dynamic_data_extractor.cc',
         'src/internal/cld2_dynamic_data_tool.cc',
       ],
+      'defines': ['CLD2_DYNAMIC_MODE'],
     },
 
     {
       # GN version: //third_party/cld_2
+      # Depending upon cld_2 will provide core headers and function definitions,
+      # but no data. You must also declare on one of the following two targets:
+      # cld2_static - for a statically-linked data set built into the executable
+      # cld2_dynamic - for a dynamic data set loaded at runtime
       'target_name': 'cld_2',
       'type': 'static_library',
-      'sources': [],
+      'sources': ['<@(cld2_core_sources)'],
       'dependencies': [],
-      'conditions': [
-        ['cld2_data_source=="static"',
-          {'dependencies': ['cld2_static']},
-          {'dependencies': ['cld2_dynamic']}
-        ],
-      ],
     },
 
     {
       # GN version: //third_party/cld_2
       'target_name': 'cld2_static',
       'type': 'static_library',
       'include_dirs': [
         'src/internal',
         'src/public',
       ],
       'sources': [
         '<@(cld2_core_sources)',
+        '<@(cld2_core_impl_sources)',
         '<@(cld2_data_sources)',
       ],
     },
 
     {
       # GN version: //third_party/cld_2
       'target_name': 'cld2_dynamic',
       'type': 'static_library',
       'include_dirs': [
         'src/internal',
         'src/public',
       ],
       'sources': [
         '<@(cld2_core_sources)',
+        '<@(cld2_core_impl_sources)',
         '<@(cld2_dynamic_data_loader_sources)',
       ],
       'defines': ['CLD2_DYNAMIC_MODE'],
-      'all_dependent_settings': {
-        'defines': ['CLD2_DYNAMIC_MODE'],
-      },
     },
   ],
 }