GitLab

apk_merger: Simplify merging by inferring native libraries

The APK merger script originally composed a combined APK from pure 32-
and 64-bit versions, but it doesn't do that anymore. Today, its job is
simply to make the 32-bit portions consistent between a pure 32-bit
build and a multi-arch 64-bit build that includes 32-bit.

Based on this, we can simplify the script by:

- Not specifying any native library names as script arguments. We'll
  see which libs are in the 32-bit version, and simply copy them all
  over. This makes handling feature-specific libraries much easier.

- Combining the notion of "expected" merge files and "exclude from
  64-bit" files. These are the same concept, and don't need to be
  separate lists.

- Centralizing control of uncompressed native libraries. There is no
  need to track compression needs on a per-file basis.

Bug: 962477
Change-Id: If3bcc8379508a1f7407a890fa042f8fd3ab27320
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1634388Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665567}