commit e002e68a48d1c82648eadde2f6aafa20d08c36f2
author Sylvain Defresne <sdefresne@chromium.org> Thu Sep 03 17:31:02 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Sep 09 08:31:19 2020 +0000
tree 685b8c4b305c72470fb8a0f686c3008d9d01e7c9
parent 32c8eaf95838a8c72b093dfbefa0cf593b234dd5

Add support for symbolset to bundle_data targets

Bug: none
Change-Id: Ida994e1bf181c19258622e9b0901d406cfba4999
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/9881
Reviewed-by: Brett Wilson <brettw@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>

src/gn/bundle_data.cc

diff --git a/src/gn/bundle_data.cc b/src/gn/bundle_data.cc
index 4461168..6b7fe77 100644
--- a/src/gn/bundle_data.cc
+++ b/src/gn/bundle_data.cc
@@ -28,21 +28,23 @@
   // Check whether |source| matches one of the following pattern:
   //    .*\.xcassets/Contents.json
   //    .*\.xcassets/[^/]*\.appiconset/[^/]*
-  //    .*\.xcassets/[^/]*\.imageset/[^/]*
-  //    .*\.xcassets/[^/]*\.launchimage/[^/]*
   //    .*\.xcassets/[^/]*\.colorset/[^/]*
   //    .*\.xcassets/[^/]*\.dataset/[^/]*
+  //    .*\.xcassets/[^/]*\.imageset/[^/]*
+  //    .*\.xcassets/[^/]*\.launchimage/[^/]*
+  //    .*\.xcassets/[^/]*\.symbolset/[^/]*
   bool is_file_from_asset_catalog = false;
   std::string_view dir = FindDirNoTrailingSeparator(source);
   if (base::EndsWith(source, "/Contents.json", base::CompareCase::SENSITIVE) &&
       base::EndsWith(dir, ".xcassets", base::CompareCase::SENSITIVE)) {
     is_file_from_asset_catalog = true;
   } else if (base::EndsWith(dir, ".appiconset", base::CompareCase::SENSITIVE) ||
+             base::EndsWith(dir, ".colorset", base::CompareCase::SENSITIVE) ||
+             base::EndsWith(dir, ".dataset", base::CompareCase::SENSITIVE) ||
              base::EndsWith(dir, ".imageset", base::CompareCase::SENSITIVE) ||
              base::EndsWith(dir, ".launchimage",
                             base::CompareCase::SENSITIVE) ||
-             base::EndsWith(dir, ".colorset", base::CompareCase::SENSITIVE) ||
-             base::EndsWith(dir, ".dataset", base::CompareCase::SENSITIVE)) {
+             base::EndsWith(dir, ".symbolset", base::CompareCase::SENSITIVE)) {
     dir = FindDirNoTrailingSeparator(dir);
     is_file_from_asset_catalog =
         base::EndsWith(dir, ".xcassets", base::CompareCase::SENSITIVE);