GitLab

These broke when the new disk layout was enabled in 4602841f for bug
958976. The updater work done in bug 964023 didn’t properly account for
canaries. dmgdiffer.sh is invoked with a “product_name” parameter which
is either “Google Chrome” or “Google Chrome Canary”. Under both old and
new layouts, the framework embedded in the canary is not renamed, but
ships as “Google Chrome Framework.framework”. This is intentional. But
because that framework directory is now outside the versioned directory,
dmgdiffer.sh needs to be aware of its path, because it defines a
“cut” at the versioned directory. By accidentally using the product_name
to define the name of the framework, dmgdiffer.sh broke for just the
canary channel.

As a solution, for just the purpose of defining the name of the
framework under the new layout, dmgdiffer.sh will use the name “Google
Chrome Framework.framework” for the framework when producing a canary
updater. This was chosen instead of a full-time hard-code of “Google
Chrome Framework.framework” in case anyone else uses dmgdiffer.sh to
produce binary diffs of Chromium-like products. For example,
Chromium.app embeds a framework named “Chromium Framework.framework”,
not “Google Chrome Framework.framework”.

This also has a better way to get the Current symbolic link to appear in
the application dirpatch, and fixes a bug in README generation.

Bug: 964712
Change-Id: I3e0a529b1fad08ac7066fcb79423a1dff5df003e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1619066
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Auto-Submit: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661217}