diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 01:08:28 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 01:08:28 +0000 |
| commit | fce6b974c10c7ba04d7dd8add2365b91c05a2eb0 (patch) | |
| tree | d573b1e8da1ad90030991e00dfd0ecdaab13818c /build | |
| parent | 7bcfd55457cd98f205229cc2633f86449b726b71 (diff) | |
| download | chromium_src-fce6b974c10c7ba04d7dd8add2365b91c05a2eb0.zip chromium_src-fce6b974c10c7ba04d7dd8add2365b91c05a2eb0.tar.gz chromium_src-fce6b974c10c7ba04d7dd8add2365b91c05a2eb0.tar.bz2 | |
Allow the official target to be used for non-official builds.
Make sure we include PDF only when it is available. (It is not available
on the normal non-official builds.
Review URL: http://codereview.chromium.org/6125002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index b7e0dcf..212c6c9 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -391,7 +391,7 @@ }, ], # targets 'conditions': [ - ['(branding=="Chrome" and buildtype=="Official")', { + ['branding=="Chrome"', { 'targets': [ { 'target_name': 'chrome_official_builder', @@ -409,13 +409,19 @@ '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette', - '../pdf/pdf.gyp:pdf', '../third_party/adobe/flash/flash_player.gyp:flash_player', '../webkit/webkit.gyp:test_shell', ], + 'conditions': [ + ['internal_pdf', { + 'dependencies': [ + '../pdf/pdf.gyp:pdf', + ], + }], # internal_pdf + ] }, ], # targets - }], # (branding=="Chrome" and buildtype=="Official") + }], # branding=="Chrome" ], # conditions }], # OS="win" ['chromeos==1', { |