Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: build/all.gyp

Issue 6125002: Allow the official target to be used for non-official builds.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 70679)
+++ build/all.gyp (working copy)
@@ -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', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698