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

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 2746 matching lines @@
         'defines': ['ENABLE_GOOGLE_NOW=1'],
       }],
       ['cld_version!=0', {
         'defines': ['CLD_VERSION=<(cld_version)'],
       }],
       ['cld_version==2', {
         # This is used to populate the "CLD Data Source" field in:
         # 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', {
         'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
       }],
       ['enable_printing==2', {
         'defines': ['ENABLE_PRINTING=1'],
       }],
       ['OS=="win" and win_pdf_metafile_for_printing==1', {
         'defines': ['WIN_PDF_METAFILE_FOR_PRINTING=1'],
@@ skipping 2869 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }