To make Bazel's use of the official Android manifest merger tool consistent with the tools:targetApi
attribute., 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 with the following patch:
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.
The following jars contain the same contents as their versions without -stripped, except that we removed some classes from them.
Classes removed: com/android/ide/common/util/AssetUtil.class com/android/ide/common/util/AssetUtil$FillEffect.class com/android/ide/common/util/AssetUtil$ShadowEffect.class com/android/ide/common/rendering/LayoutLibrary.class com/android/ide/common/rendering/api/IImageFactory.class com/android/ide/common/rendering/api/RenderSession.class com/android/ide/common/rendering/StaticRenderSession.class com/android/ide/common/vectordrawable/VdElement.class com/android/ide/common/vectordrawable/EllipseSolver.class com/android/ide/common/vectordrawable/SvgTree.class com/android/ide/common/vectordrawable/SvgGroupNode.class com/android/ide/common/vectordrawable/VdPath.class com/android/ide/common/vectordrawable/VdPath$Node.class com/android/ide/common/vectordrawable/SvgNode.class com/android/ide/common/vectordrawable/VdPreview.class com/android/ide/common/vectordrawable/SvgLeafNode.class com/android/ide/common/vectordrawable/VdTree.class com/android/ide/common/vectordrawable/VdNodeRender.class com/android/ide/common/vectordrawable/VdIcon.class com/android/ide/common/vectordrawable/VdGroup.class
These are unused in the bazel code base (transitively) and were the last remaining bits on the java.desktop dependency.