diff options
| author | andrewhayden <andrewhayden@chromium.org> | 2014-11-11 09:47:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-11 17:47:36 +0000 |
| commit | 14d91355848a733b18396d74c97d6b945260b899 (patch) | |
| tree | 28bdfe9f0561e72b95a08552fc69e5a51af8224c /chrome/chrome_dll.gypi | |
| parent | 7742fb4516ba94d8c0b6cdb8ddbb25839065642f (diff) | |
| download | chromium_src-14d91355848a733b18396d74c97d6b945260b899.zip chromium_src-14d91355848a733b18396d74c97d6b945260b899.tar.gz chromium_src-14d91355848a733b18396d74c97d6b945260b899.tar.bz2 | |
Refactor language detection logic to allow non-static CLD data sources.
This change further refines the approach taken in setting the implementation
used for accessing compact language detector at runtime. It is based upon the
pattern used in content_client.h, though adapted for this specific use case.
Fundamentally, there is a switch from having exactly one linked-in class define
a global method to instead having the high-level targets (like the content
shell, chrome shell, and so on) be responsible for setting the implementation
that is desired. This eliminates a lot of the ugly GYP/GN logic, but requires
work for each high-level target.
BUG=367239
Review URL: https://codereview.chromium.org/461633002
Cr-Commit-Position: refs/heads/master@{#303669}
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index f6feecf..024f34d 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -256,14 +256,14 @@ '../content/content.gyp:content_app_browser', ], }], - ['cld_version==0 or cld_version==1', { + ['cld_version==1', { 'dependencies': [ - '../third_party/cld/cld.gyp:cld', + '<(DEPTH)/third_party/cld/cld.gyp:cld', ], }], ['cld_version==0 or cld_version==2', { 'dependencies': [ - '../third_party/cld_2/cld_2.gyp:cld_2', + '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', ], }], ['OS=="mac" and component!="shared_library"', { |