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

third_party/cld_2/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 
 # May need to make this a build arg, keep the name for now to match gyp
 cld2_table_size = 2
 
 core_files = [
@@ skipping 70 matching lines @@
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   if (is_win) {
     cflags = [ "/wd4267" ]  # size_t -> int conversion.
   }
 }
 
-static_library("cld2_static") {
+# As in the corresponding gyp file, this just builds the core interfaces for
+# CLD2. You must still declare a dependency on a specific data set, either
+# cld2_dynamic or cld2_static. 
+static_library("cld_2") {
   sources = core_files
   include_dirs = [
     "src/internal",
     "src/public",
   ]
 
-  deps = [ ":cld2_data" ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   if (is_win) {
     cflags = [ "/wd4267" ]  # size_t -> int conversion.
   }
 }
 
-# Meta-target for convenience; dependents don't need to know if this if CLD2
-# is in dynamic or static configuration.
-group("cld_2") {
-  if (cld2_data_source == "static") {
-    deps = [ ":cld2_static" ]
-  } else {
-    deps = [ ":cld2_dynamic" ]
+static_library("cld2_static") {
+  sources = core_files
+  include_dirs = [
+    "src/internal",
+    "src/public",
+  ]
+
+  deps = [ ":cld2_data" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  if (is_win) {
+    cflags = [ "/wd4267" ]  # size_t -> int conversion.
   }
 }
 
 config("cld2_dynamic_mode_config") {
   defines = [ "CLD2_DYNAMIC_MODE" ]
 }
 
 static_library("cld2_dynamic") {
   sources = core_files + data_loader_files
-  all_dependent_configs = [ ":cld2_dynamic_mode_config" ]
   include_dirs = [
     "src/internal",
     "src/public",
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code", ":cld2_dynamic_mode_config" ]
 
   if (is_win) {
     cflags = [ "/wd4267" ]  # size_t -> int conversion.
   }
 }
 
 # Does not build on Windows.
 if (!is_win) {
   executable("cld_2_dynamic_data_tool") {
     sources = [
       "src/internal/cld2_dynamic_data_extractor.h",
       "src/internal/cld2_dynamic_data_extractor.cc",
       "src/internal/cld2_dynamic_data_tool.cc",
     ]
 
     include_dirs = [
       "src/internal",
       "src/public",
     ]
 
     deps = [ ":cld2_data", ":cld2_dynamic" ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code", ":cld2_dynamic_mode_config" ]
 
     if (is_win) {
       cflags = [ "/wd4267" ]  # size_t -> int conversion.
     }
   }
 }