Make it possible to generate static and dynamic CLD2 libraries in one build.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index ef1ce1539735ae4c30880c0bc390bc5f4b2e8448..dab904a4f5d131fabc53e3e778a729f956fc7065 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2764,18 +2764,13 @@
         # chrome://translate-internals
         'defines': ['CLD2_DATA_SOURCE=<(cld2_data_source)'],
       }],
-      ['cld2_data_source=="static"', {
+      ['cld_version==2 and cld2_data_source=="static"', {
         'defines': ['CLD_DATA_FROM_STATIC'],
-      }, {
-        # CLD2 headers use this #define to control the visibility of dynamic
-        # mode functions. We use these functions, so we must define here for
-        # our #includes to work right.
-        'defines': ['CLD2_DYNAMIC_MODE'],
       }],
-      ['cld2_data_source=="standalone"', {
+      ['cld_version==2 and cld2_data_source=="standalone"', {
         'defines': ['CLD_DATA_FROM_STANDALONE'],
       }],
-      ['cld2_data_source=="component"', {
+      ['cld_version==2 and cld2_data_source=="component"', {
         'defines': ['CLD_DATA_FROM_COMPONENT'],
       }],
       ['enable_printing==1', {