GitLab

This reverts commit ef18e86a.

Reason for revert: Make sure apk_merger.py works with and without the
unwind file, till downstream cl lands. Also rebase on:
https://chromium-review.googlesource.com/c/chromium/src/+/994545
and remove workaround for crbug/828528.

Original change's description:
> Revert "Enable extracting unwind table on official builds without channel"
>
> This reverts commit 16e808d7.
>
> Reason for revert: Merge step still failing.
>
> Original change's description:
> > Enable extracting unwind table on official builds without channel
> >
> > The original cl was here:
> > https://chromium-review.googlesource.com/c/chromium/src/+/990092
> > This CL fixes the following problems with the original CL:
> > 1. The apk_merger script fails because the unwind tables were only added
> >    in 32-bit apk. The merger script expects all the files to be same and
> >    the ones different should be checked.
> >  1a. The resources.arsc is non-hermetic and ordering is affected by
> >      adding file to only one apk. As a workaround for crbug/828528,
> >      add an empty (valid) unwind table file to the 64 bit monochrome
> >      apk to make the resource.arsc consistent.
> >  1b. The merger script simply adds all the files in apk which are not
> >      same. To keep the script simple and functional, the unwind resource
> >      is renamed to unwind_cfi_32 and unwind_cfi_empty in respective
> >      builds and the app_merger is updated to specify this file is
> >      expected to be different and included. This causes an extra file
> >      (4 byte) in the merged apk.
> >
> > 2. The unwind tables were always generated for "libchrome.so" for all
> >    chrome apks. The different chrome_apk(s) have different shared
> >    libraries like libchromefortest, etc.. So, update the unwind asset to
> >    get unwind table for the right library for each apk. Only adds assets
> >    to *_public_apk(s).
> >
> > 3. The monochrome_apk_checker was failing because the unwind file
> >    included was different in chrome_apk and monochrome_apk. This CL adds
> >    the asset to all apk at the same time and adds exception for this
> >    file.
> >
> > BUG=819888
> > TBR=dpranke@chromium.org
> >
> > Change-Id: Ibceeeacc19fa424d519891b8c17e349ee6c2dfd6
> > Reviewed-on: https://chromium-review.googlesource.com/991236
> > Commit-Queue: Siddhartha S <ssid@chromium.org>
> > Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
> > Reviewed-by: Bo <boliu@chromium.org>
> > Reviewed-by: agrieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#547993}
>
> TBR=boliu@chromium.org,dpranke@chromium.org,mariakhomenko@chromium.org,changwan@chromium.org,ssid@chromium.org,agrieve@chromium.org
>
> Change-Id: I0a96e213133b6cb21c36db365b7c72f0f4642c8e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 819888
> Bug: 828879
> Reviewed-on: https://chromium-review.googlesource.com/995697
> Reviewed-by: Anthony Berent <aberent@chromium.org>
> Commit-Queue: Anthony Berent <aberent@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548066}

TBR=dpranke@chromium.org,mariakhomenko@chromium.org

Bug: 819888, 828879
Change-Id: I2eba81de32632bea90171ece4cba1a4144c55d25
Reviewed-on: https://chromium-review.googlesource.com/996272
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Siddhartha S <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548249}