| # Notes on patches |
| |
| To make Bazel's use of the official Android manifest merger tool consistent with |
| the [`tools:targetApi` |
| attribute.](https://developer.android.com/studio/write/tool-attributes#toolstargetapi), |
| `com.android.tools.build_manifest-merger_25.0.0-patched.jar` contains a patched |
| `OtherOperationType.class`. The patched class is generated by compiling |
| `build-system/manifest-merger/src/main/java/com/android/manifmerger/OtherOperationType.java` |
| from commit 8fff824b40 in |
| [studio-master-dev](https://android.googlesource.com/platform/tools/base/+/master/build-system/manifest-merger/src/main/java/com/android/manifmerger) |
| with the following patch: |
| |
| ```diff |
| diff --git a/build-system/manifest-merger/src/main/java/com/android/manifmerger/OtherOperationType.java b/build-system/manifest-merger/src/main/java/com/android/manifmerger/OtherOperationType.java |
| index d0ca70b544..095a781f56 100644 |
| --- a/build-system/manifest-merger/src/main/java/com/android/manifmerger/OtherOperationType.java |
| +++ b/build-system/manifest-merger/src/main/java/com/android/manifmerger/OtherOperationType.java |
| @@ -26,5 +26,5 @@ public enum OtherOperationType { |
| ignore, |
| |
| // used to direct lint |
| - targetAPI |
| + targetApi, |
| } |
| ``` |
| |
| Commit 8fff824b40 was chosen as it was the latest commit before the release of the `manifest-merger:25.0.0` artifact. |
| |
| For more information, see <https://github.com/bazelbuild/bazel/issues/6645>. |