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

Unified Diff: build/all.gyp

Issue 1069903002: Update gn_all, gyp_remaining for chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix symupload merge Created 5 years, 8 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 | « BUILD.gn ('k') | build/gn_migration.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index d3b4140c8913e8fea4bf65be9717332debd3a94e..40a7e29809fc9d6185c7f2223343a30247d1f90f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -494,7 +494,7 @@
],
'conditions': [
# TODO(GYP): make gn_migration.gypi work unconditionally.
- ['OS=="win" or (OS=="linux" and target_arch=="x64" and chromeos==0 and chromecast==0 and disable_nacl==0)', {
+ ['OS=="win" or (OS=="linux" and target_arch=="x64" and chromecast==0)', {
'includes': [
'gn_migration.gypi',
],
« no previous file with comments | « BUILD.gn ('k') | build/gn_migration.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698