Add a component updater for the CLD2 data file.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e9849e555acc8e7d657b07c0b4c8afc2cd2adf7b..55c6d819f4f2804f026be018e3359a94e090ab3c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -448,6 +448,14 @@
       #      be loaded at runtime.
       'cld2_dynamic%': 0,
 
+      # Whether CLD2 is a component. Only evaluated if cld_version == 2 and
+      # cld2_dynamic == 1.
+      #   0: Not a component. If cld2_dynamic == 1, it is up to the distribution
+      #      to ensure that the data file is provided if desired.
+      #   1: Componentized. CLD data should be obtained via the Component
+      #      Updater.
+      'cld2_is_component%': 0,
+
       # Enable spell checker.
       'enable_spellcheck%': 1,
 
@@ -651,8 +659,9 @@
         ['OS=="android"', {
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'cld_version%': 1,
-          'cld2_dynamic%': 0,
+          'cld_version%': 2,
+          'cld2_dynamic%': 1,
+          'cld2_is_component%': 1,
           'enable_spellcheck%': 0,
           'enable_themes%': 0,
           'remoting%': 0,
@@ -1022,6 +1031,7 @@
     'cld_version%': '<(cld_version)',
     'cld2_table_size%': '<(cld2_table_size)',
     'cld2_dynamic%': '<(cld2_dynamic)',
+    'cld2_is_component%': '<(cld2_is_component)',
     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
     'disable_ftp_support%': '<(disable_ftp_support)',
     'enable_task_manager%': '<(enable_task_manager)',
@@ -2562,6 +2572,9 @@
       ['cld2_dynamic!=0', {
         'defines': ['CLD2_DYNAMIC_MODE=1'],
       }],
+      ['cld2_is_component!=0', {
+        'defines': ['CLD2_IS_COMPONENT=1'],
+      }],
       ['enable_printing==1', {
         'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
       }],