commit 894835059979c99c8551f9d1c72de8f4a11290bc
author Sylvain Defresne <sdefresne@chromium.org> Fri Jun 05 14:36:54 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Jun 05 15:44:46 2020 +0000
tree e74b41fa26c92f8d1142471fce6b49057360f830
parent 981f46c64d1456d2083b1a2fa1367e753e0cdc1b

Fix incorrect check for expansion of {{bundle_root_dir}}

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

src/gn/bundle_file_rule.cc

diff --git a/src/gn/bundle_file_rule.cc b/src/gn/bundle_file_rule.cc
index 4c4e96e..719e8aa 100644
--- a/src/gn/bundle_file_rule.cc
+++ b/src/gn/bundle_file_rule.cc
@@ -54,7 +54,7 @@
     if (subrange.type == &SubstitutionLiteral) {
       output_path.append(subrange.literal);
     } else if (subrange.type == &SubstitutionBundleRootDir) {
-      if (bundle_data.contents_dir().is_null()) {
+      if (bundle_data.root_dir().is_null()) {
         *err = ErrMissingPropertyForExpansion(settings, target, this,
                                               variables::kBundleRootDir);
         return false;