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

This is necessary to allow building multiple targets with conflicting
requirements, such as chrome_shell (needing a statically-linked CLD2) at the
same time as the APK for Android (using, e.g., the "component" CLD2 data
source). For more information and background, refer to the linked bug.

This change should be a no-op in all current build configurations, but moves
closer to enabling the behavior described above.

BUG=367239
TBR=toyoshim
NOTRY=true

Review URL: https://codereview.chromium.org/416863002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@285289 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

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', {