Modularize Compact Language Detector 2 (CLD2) data sources

components/translate.gypi

Index: components/translate.gypi
diff --git a/components/translate.gypi b/components/translate.gypi
index 5a15611ecef155bec34b6d655d60f83e52479996..054297eab5192c1adb3edd2b8c8457556522262c 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -130,9 +130,22 @@
             '..',
           ],
           'sources': [
+            'translate/content/browser/browser_cld_data_provider.h',
             'translate/content/browser/content_translate_driver.cc',
             'translate/content/browser/content_translate_driver.h',
            ],
+          'conditions': [
+            ['cld_version==2', {
+              'conditions': [
+                ['cld2_dynamic==1', {
+                  'sources': [
+                    'translate/content/browser/data_file_browser_cld_data_provider.cc',
+                    'translate/content/browser/data_file_browser_cld_data_provider.h',
+                  ],
+                }],
+              ]},
+            ],
+          ],
         },
         {
           'target_name': 'translate_content_common',
@@ -151,6 +164,45 @@
             'translate/content/common/translate_messages.cc',
             'translate/content/common/translate_messages.h',
            ],
+           'conditions': [
+             ['cld_version==2', {

[droger, 2014/06/19 08:38:23]

why not
['cld_version==2' and 'cld2_dynamic==1', {

[Andrew Hayden (chromium.org), 2014/06/19 09:27:11]

Because I forgot the gyp syntax for 'and' (oh right, it's not &&). I'll change
this around, but the next review after this is submitted is going to clean up
the variables and replace them with an enumerated choice of values:
CLD_DATA_ACQUISITION=[component_updater|bundled_file|static_link|custom]

So no big deal, probably.

[Andrew Hayden (chromium.org), 2014/06/19 13:40:19]

Done.

+               'conditions': [
+                 ['cld2_dynamic==1', {
+                   'sources': [
+                     'translate/content/common/data_file_cld_data_provider_messages.cc',
+                     'translate/content/common/data_file_cld_data_provider_messages.h',
+                   ],
+                 }],
+               ]},
+             ],
+           ],
+        },
+        {
+          'target_name': 'translate_content_renderer',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_common',
+            '../ipc/ipc.gyp:ipc',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'translate/content/renderer/renderer_cld_data_provider.h',
+           ],
+          'conditions': [
+            ['cld_version==2', {
+              'conditions': [
+                ['cld2_dynamic==1', {
+                  'sources': [
+                    'translate/content/renderer/data_file_renderer_cld_data_provider.cc',
+                    'translate/content/renderer/data_file_renderer_cld_data_provider.h',
+                  ],
+                }],
+              ]},
+            ],
+          ],
         },
       ],
     }],