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

Unified Diff: build/all.gyp

Issue 12321094: Fix Win64 official build due to missing pyauto target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 184179)
+++ build/all.gyp (working copy)
@@ -659,7 +659,6 @@
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:performance_ui_tests',
'../chrome/chrome.gyp:policy_templates',
- '../chrome/chrome.gyp:pyautolib',
'../chrome/chrome.gyp:reliability_tests',
'../chrome/chrome.gyp:automated_ui_tests',
'../chrome/installer/mini_installer.gyp:mini_installer',
@@ -670,6 +669,13 @@
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
],
'conditions': [
+ # If you change this condition, make sure you also change it
+ # in chrome_tests.gypi
+ ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:pyautolib',
+ ],
+ }],
['internal_pdf', {
'dependencies': [
'../pdf/pdf.gyp:pdf',
« 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