Fix ManifestMergerAction test case on windows #13760
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bencodes
force-pushed
the
fix-manifestmergeraction-test-case-on-windows
branch
from
a72b9d5
to
6937c81
Compare
Bencodes
force-pushed
the
fix-manifestmergeraction-test-case-on-windows
branch
2 times, most recently
from
a7bbc1e
to
db542cc
Compare
ted-xie
requested changes
Mar 23, 2022
| @@ -174,8 +174,7 @@ private static Path removePermissions(Path manifest, Path outputDir) | |||
| } | |||
| } | |||
| // Write resulting manifest to the output directory, maintaining full path to prevent collisions | |||
There was a problem hiding this comment.
I think this comment is no longer valid with your change. The full path is no longer maintained; rather, a temporary file is created at $outputDir/.xml/${gibberish}AndroidManifest.
There was a problem hiding this comment.
Nice catch. I updated the comment to reference the new tmp path.
Bencodes
force-pushed
the
fix-manifestmergeraction-test-case-on-windows
branch
from
db542cc
to
2d6defb
Compare
ted-xie
pushed a commit
to ted-xie/bazel
that referenced
this pull request
Jul 6, 2022
`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
ckolli5
pushed a commit
that referenced
this pull request
Jul 6, 2022
* Support uses-permission merging in manifest merger Adding support for conditionally merging `uses-permissions`. #10628 #5411 Closes #13445. RELNOTES: Enable merging permissions during Android manifest merging with the --merge_android_manifest_permissions flag. PiperOrigin-RevId: 439613035 * 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 #14427. PiperOrigin-RevId: 447808701 * 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 #13760. PiperOrigin-RevId: 438643774 Co-authored-by: Ben Lee <ben@ben.cm>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
manifest.toString().replaceFirst("^/", "")silently fails on windows machines causingremovePermissionsto write to the original test file. This pull request creates a new temp file thatremovePermissionscan 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