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

Unified Diff: ui/vector_icons/aggregate_vector_icons.py

Issue 2569333002: Address some TODO(GYP_GONE)s (Closed)
Patch Set: reland Created 3 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 | « ui/gl/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/vector_icons/aggregate_vector_icons.py
diff --git a/ui/vector_icons/aggregate_vector_icons.py b/ui/vector_icons/aggregate_vector_icons.py
index 6b028fee7abcc09078d165555cabb2bfa934e546..bf46ffd8bcd7cf375e7ba82f1a385f456c6d7bbd 100644
--- a/ui/vector_icons/aggregate_vector_icons.py
+++ b/ui/vector_icons/aggregate_vector_icons.py
@@ -13,18 +13,10 @@ import textwrap
def AggregateVectorIconsLegacy(working_directory, file_list, output_cc,
output_h):
icon_list = []
- if file_list is None:
- # TODO(GYP_GONE): |file_list| is only None for GYP builds (where response
- # files are not supported), in which case we process all .icon files
- # contained within |working_directory| and all of its descendant
- # directories. This logic can be removed when GN is used everywhere.
- # See crbug.com/535386.
- for dirpath, dirnames, filenames in os.walk(working_directory):
- icon_list.extend(glob.glob(os.path.join(dirpath, "*.icon")))
- else:
- with open(file_list, 'r') as f:
- file_list_contents = f.read()
- icon_list = shlex.split(file_list_contents)
+ assert file_list is not None
+ with open(file_list, 'r') as f:
+ file_list_contents = f.read()
+ icon_list = shlex.split(file_list_contents)
input_header_template = open(os.path.join(working_directory,
"vector_icons.h.template"))
« no previous file with comments | « ui/gl/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698