commit f2d06ed4c586c85b663a8bedf588c454d9113c19
author Sylvain Defresne <sdefresne@chromium.org> Wed Sep 27 14:05:13 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Sep 27 14:05:13 2017 +0000
tree 26242f33a69bebff075a70731c5fd1878b8161fe
parent b24c65c63badd62dfc32c62718b489bbda67e565

Remove workaround to compute create_bundle output.

A workaround was introduced in GetBundleRootDirOutput in order to
support migration from $bundle_root_dir to $bundle_content_dir.

Remove the workaround now that the GN build files have been fixed
to use the new property.

Bug: 764286
Change-Id: I7e2c1463360cb8eb678129b7ac8de8530cf7fcd4
Reviewed-on: https://chromium-review.googlesource.com/675643
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#504653}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c45d55ec63771fd45d782c1e38cefdcbfd7aa2e4

tools/gn/bundle_data.cc

diff --git a/tools/gn/bundle_data.cc b/tools/gn/bundle_data.cc
index f117ec2..a1f985d 100644
--- a/tools/gn/bundle_data.cc
+++ b/tools/gn/bundle_data.cc
@@ -156,46 +156,12 @@
 }
 
 SourceFile BundleData::GetBundleRootDirOutput(const Settings* settings) const {
-  // TODO(crbug.com/764286): all bundles used to be created in $root_out_dir
-  // and the bundle main output was assumed to be the first path component
-  // relative to $root_out_dir.
-  //
-  // This broke when Chrome on iOS had to generate multiple bundles with the
-  // same names (variation of the same bundle with some assets swapped). To
-  // fix this, a new variable $bundle_contents_dir was added to support that
-  // macOS bundle files are not in the root of the bundle but in a subdirectory.
-  //
-  // To allow migration introducing this variable without breaking existing
-  // code, the function does the following heuristic:
-  // 1. if $bundle_contents_dir is defined, then returns $bundle_root_dir,
-  // 2. otherwise, returns the first component of $bundle_root_dir relative
-  //    to $root_out_dir (this was the old code).
-  //
-  // Remove those heuristics when all the code has been fixed to use the new
-  // variable $bundle_contents_dir instead of $bundle_root_dir, and just return
-  // the value of $bundle_root_dir.
+  std::string root_dir_value = root_dir().value();
+  size_t last_separator = root_dir_value.rfind('/');
+  if (last_separator != std::string::npos)
+    root_dir_value = root_dir_value.substr(0, last_separator);
 
-  if (!contents_dir().is_null()) {
-    std::string root_dir_value = root_dir().value();
-    size_t last_separator = root_dir_value.rfind('/');
-    if (last_separator != std::string::npos)
-      root_dir_value = root_dir_value.substr(0, last_separator);
-
-    return SourceFile(SourceFile::SWAP_IN, &root_dir_value);
-  }
-
-  const SourceDir& build_dir = settings->toolchain_output_dir();
-  std::string bundle_root_relative = RebasePath(root_dir().value(), build_dir);
-
-  size_t first_component = bundle_root_relative.find('/');
-  if (first_component != std::string::npos) {
-    base::StringPiece outermost_bundle_dir =
-        base::StringPiece(bundle_root_relative).substr(0, first_component);
-    std::string return_value(build_dir.value());
-    outermost_bundle_dir.AppendToString(&return_value);
-    return SourceFile(SourceFile::SWAP_IN, &return_value);
-  }
-  return SourceFile(root_dir().value());
+  return SourceFile(SourceFile::SWAP_IN, &root_dir_value);
 }
 
 SourceDir BundleData::GetBundleRootDirOutputAsDir(

tools/gn/runtime_deps_unittest.cc

diff --git a/tools/gn/runtime_deps_unittest.cc b/tools/gn/runtime_deps_unittest.cc
index ed0eea4..5dc89eb 100644
--- a/tools/gn/runtime_deps_unittest.cc
+++ b/tools/gn/runtime_deps_unittest.cc
@@ -350,10 +350,12 @@
 
   Target bundle(setup.settings(), Label(source_dir, "bundle"));
   InitTargetWithType(setup, &bundle, Target::CREATE_BUNDLE);
-  const std::string root_dir(build_dir + "Bundle.framework/Versions/A/");
+  const std::string root_dir(build_dir + "Bundle.framework/");
+  const std::string contents_dir(root_dir + "Versions/A/");
   bundle.bundle_data().root_dir() = SourceDir(root_dir);
-  bundle.bundle_data().resources_dir() = SourceDir(root_dir + "Resources");
-  bundle.bundle_data().executable_dir() = SourceDir(root_dir + "MacOS");
+  bundle.bundle_data().contents_dir() = SourceDir(contents_dir);
+  bundle.bundle_data().resources_dir() = SourceDir(contents_dir + "Resources");
+  bundle.bundle_data().executable_dir() = SourceDir(contents_dir + "MacOS");
   bundle.private_deps().push_back(LabelTargetPair(&dylib_data));
   bundle.private_deps().push_back(LabelTargetPair(&module_data));
   bundle.data_deps().push_back(LabelTargetPair(&data_dep));