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>
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);