Suppression the problems on the build bots: There were two reasons why that CL broke the build tree. One is the size bloating, which was solved by https://codereview.chromium.org/23460018. The other is compiling error on ARM, and this was also solved by updating CLD2 (https://chromiumcodereview.appspot.com/23606017/).

--

Use Finch to compare the performances of CLD1 and CLD2

Add a compile time constant CLD_VERSION, which indicates the version of CLD. If this is not define, Finch test to compare CLD1 and CLD2 is supposed to be used.

By this CL, each platform will have the below status:

Linux:    Use both CLD1 and CLD2 (and use Finch).
Mac OS X: Use both CLD1 and CLD2 (and use Finch).
Windows:  Use only CLD1 once because now CLD2 can't be compiled on Windows. After we can have CLD2 compiled on Windows, we will use CLD2 and Finch asap.
iOS:      Still use only CLD1. (It's because it is hard to use both CLD1 and CLD2 on mobile platform because of the binary size impact.)
Android:  Still use only CLD1. (The same reason as iOS)

So some platforms will have two CLD binaries, but this is temporal in the sense that we intend to use Finch only for Dev and Beta channel. Before releasing the stable Chromium version, we decide which version of CLD is adopted, make another CL to use only one CLD, and send a merge request. (Of course, we hope we will be able to adopt CLD2.)

BUG=240647

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=221380

Review URL: https://chromiumcodereview.appspot.com/22867032

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

all.gyp

@@ -46,7 +46,6 @@
             '../printing/printing.gyp:*',
             '../skia/skia.gyp:*',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
-            '../third_party/cld/cld.gyp:*',
             '../third_party/codesighs/codesighs.gyp:*',
             '../third_party/ffmpeg/ffmpeg.gyp:*',
             '../third_party/iccjpeg/iccjpeg.gyp:*',

common.gypi

@@ -341,6 +341,12 @@
       # print, UI, etc.
       'enable_printing%': 1,
 
+      # Set the version of CLD.
+      #   0: Don't specify the version. This option is for the Finch testing.
+      #   1: Use only CLD1.
+      #   2: Use only CLD2.
+      'cld_version%': 0,
+
       # Enable spell checker.
       'enable_spellcheck%': 1,
 
@@ -510,10 +516,15 @@
           'enable_one_click_signin%': 1,
         }],
 
+        ['OS=="win"', {
+          'cld_version%': 1,
+        }],
+
         ['OS=="android"', {
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
+          'cld_version%': 1,
           'enable_spellcheck%': 0,
           'enable_themes%': 0,
           'remoting%': 0,
@@ -563,6 +574,7 @@
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
+          'cld_version%': 1,
           'enable_printing%': 0,
           'enable_session_service%': 0,
           'enable_themes%': 0,
@@ -851,6 +863,7 @@
     'enable_printing%': '<(enable_printing)',
     'enable_spellcheck%': '<(enable_spellcheck)',
     'enable_google_now%': '<(enable_google_now)',
+    'cld_version%': '<(cld_version)',
     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
     'disable_ftp_support%': '<(disable_ftp_support)',
     'enable_task_manager%': '<(enable_task_manager)',
@@ -2273,6 +2286,9 @@
       ['enable_google_now==1', {
         'defines': ['ENABLE_GOOGLE_NOW=1'],
       }],
+      ['cld_version!=0', {
+        'defines': ['CLD_VERSION=<(cld_version)'],
+      }],
       ['enable_printing==1', {
         'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
       }],