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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/gypi_to_gn.py

Issue 1458653002: New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GYP Created 5 years, 1 month 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
« build/build_header.gypi ('K') | « build/config/features.gni ('k') | build/write_build_header.py » ('j') | build/write_build_header.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gypi_to_gn.py
diff --git a/build/gypi_to_gn.py b/build/gypi_to_gn.py
index a107f94fcafd14c9883c57f4438f064fd8ded1e8..6de1a6385df9d8c4d4d1b5b59ce652f0d93463d6 100644
--- a/build/gypi_to_gn.py
+++ b/build/gypi_to_gn.py
@@ -96,10 +96,12 @@ def LoadPythonDictionary(path):
if 'target_conditions' in file_data:
del file_data['target_conditions']
- # Strip targets in the toplevel, since some files define these and we can't
- # slurp them in.
+ # Strip targets and includes in the toplevel, since some files define these
+ # and we can't slurp them in.
if 'targets' in file_data:
del file_data['targets']
+ if 'includes' in file_data:
+ del file_data['includes']
return file_data
« build/build_header.gypi ('K') | « build/config/features.gni ('k') | build/write_build_header.py » ('j') | build/write_build_header.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698