Revert of Switching from CLD3 to CLD2

third_party/cld_2/BUILD.gn

Index: third_party/cld_2/BUILD.gn
diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn
index 24a9e55f4f992966a1ced7671ec429f3c9dc063e..0a61bf0dfa15a02796ab56d68abe05eef4d146bc 100644
--- a/third_party/cld_2/BUILD.gn
+++ b/third_party/cld_2/BUILD.gn
@@ -12,6 +12,11 @@
   }
 }
 
+gypi_values = exec_script("//build/gypi_to_gn.py",
+                          [ rebase_path("cld_2.gyp") ],
+                          "scope",
+                          [ "cld_2.gyp" ])
+
 config("cld2_data_warnings") {
   visibility = [ ":*" ]
   if (is_clang) {
@@ -21,20 +26,11 @@
 }
 
 static_library("cld2_data") {
-  sources = [
-    "src/internal/cld2_generated_cjk_compatible.cc",
-    "src/internal/cld2_generated_deltaoctachrome.cc",
-    "src/internal/cld2_generated_distinctoctachrome.cc",
-    "src/internal/cld_generated_cjk_delta_bi_4.cc",
-    "src/internal/cld_generated_cjk_uni_prop_80.cc",
-    "src/internal/cld_generated_score_quad_octa_2.cc",
-    "src/internal/generated_distinct_bi_0.cc",
-  ]
-
+  sources = gypi_values.cld2_data_sources
   if (cld2_table_size == 0) {
-    sources += [ "src/internal/cld2_generated_quadchrome_16.cc" ]
+    sources += gypi_values.cld2_data_smallest_sources
   } else if (cld2_table_size == 2) {
-    sources += [ "src/internal/cld2_generated_quadchrome_2.cc" ]
+    sources += gypi_values.cld2_data_largest_sources
   }
 
   include_dirs = [
@@ -65,49 +61,7 @@
 }
 
 static_library("cld_2") {
-  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",
-    "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_entities.cc",
-    "src/internal/generated_language.cc",
-    "src/internal/generated_language.h",
-    "src/internal/generated_ulscript.cc",
-    "src/internal/generated_ulscript.h",
-    "src/internal/getonescriptspan.cc",
-    "src/internal/getonescriptspan.h",
-    "src/internal/integral_types.h",
-    "src/internal/lang_script.cc",
-    "src/internal/lang_script.h",
-    "src/internal/langspan.h",
-    "src/internal/offsetmap.cc",
-    "src/internal/offsetmap.h",
-    "src/internal/port.h",
-    "src/internal/scoreonescriptspan.cc",
-    "src/internal/scoreonescriptspan.h",
-    "src/internal/stringpiece.h",
-    "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",
-  ]
-
+  sources = gypi_values.cld2_core_sources + gypi_values.cld2_core_impl_sources
   include_dirs = [
     "src/internal",
     "src/public",