Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge ManifestMergerAction-related commits into release-5.3.0 #15824

Merged
merged 3 commits into from
Jul 6, 2022
Merged

Merge ManifestMergerAction-related commits into release-5.3.0 #15824

merged 3 commits into from
Jul 6, 2022

Commits on Jul 6, 2022

  1. Support uses-permission merging in manifest merger 

    Adding support for conditionally merging `uses-permissions`.

bazelbuild#10628
bazelbuild#5411

Closes bazelbuild#13445.

RELNOTES: Enable merging permissions during Android manifest merging with the --merge_android_manifest_permissions flag.
PiperOrigin-RevId: 439613035
    @Bencodes @ted-xie
    Bencodes authored and ted-xie committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    1ab4c33 View commit details
    Browse the repository at this point in the history

  2. Make ManifestMergerAction worker compatible 

    Calling `System#exit` kills the worker during the build. Passing the exception up to the worker should be enough for it to end up in the worker or local execution output.

Closes bazelbuild#14427.

PiperOrigin-RevId: 447808701
    @Bencodes @ted-xie
    Bencodes authored and ted-xie committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    593c2fd View commit details
    Browse the repository at this point in the history

  3. Fix ManifestMergerAction test case on windows 

    `manifest.toString().replaceFirst("^/", "")` silently fails on windows machines causing `removePermissions` to write to the original test file. This pull request creates a new temp file that `removePermissions` can write the modified manifest to.

Pulling this change out of another PR so that it's easier to merge. Original PR here https://github.com/bazelbuild/bazel/pull/13445/files#r631575251

Closes bazelbuild#13760.

PiperOrigin-RevId: 438643774
    @Bencodes @ted-xie
    Bencodes authored and ted-xie committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    3390117 View commit details
    Browse the repository at this point in the history