diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 11:54:53 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 11:54:53 +0000 |
| commit | 6c2beac20246525310f2e85f5f0c33fcdbd2dff8 (patch) | |
| tree | 27911664520571621d558254f183c2d9236c9be7 /chrome/chrome_dll.gypi | |
| parent | 10d486e7a00580fd55eb64d52afce1c35c6fd5c0 (diff) | |
| download | chromium_src-6c2beac20246525310f2e85f5f0c33fcdbd2dff8.zip chromium_src-6c2beac20246525310f2e85f5f0c33fcdbd2dff8.tar.gz chromium_src-6c2beac20246525310f2e85f5f0c33fcdbd2dff8.tar.bz2 | |
Revert 221380 "Use Finch to compare the performances of CLD1 and..."
Broke
http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=ChromiumOS%20%28daisy%29&number=12452
and maybe
http://build.chromium.org/p/chromium/buildstatus?builder=Linux%20x64&number=55236
http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder&number=9603
> 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
>
> Review URL: https://chromiumcodereview.appspot.com/22867032
TBR=hajimehoshi@chromium.org
Review URL: https://codereview.chromium.org/23766011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index e7afe04..c1e12a2 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -107,6 +107,7 @@ '../crypto/crypto.gyp:crypto', '../printing/printing.gyp:printing', '../net/net.gyp:net_resources', + '../third_party/cld/cld.gyp:cld', '../ui/views/views.gyp:views', '../webkit/webkit_resources.gyp:webkit_resources', ], @@ -232,16 +233,6 @@ '../content/content.gyp:content_app_browser', ], }], - ['cld_version==0 or cld_version==1', { - 'dependencies': [ - '../third_party/cld/cld.gyp:cld', - ], - }], - ['cld_version==0 or cld_version==2', { - 'dependencies': [ - '../third_party/cld_2/cld_2.gyp:cld_2', - ], - }], ['OS=="mac" and component!="shared_library"', { 'includes': [ 'chrome_dll_bundle.gypi' ], }], |