tree d640531202f31ade98c49d84414eeb473a66d39a
parent 257d0932c1cf45b0ca144ab954b3ca3b4368bae2
author dchai <dchai@google.com> 1575592669 -0800
committer Copybara-Service <copybara-worker@google.com> 1575592739 -0800

Fix a case where aapt1 was still being used.

The fix is just to delete the aapt1 branch; since
--incompatible_prohibit_aapt1 is on, this code should never be used.  It was
because a builder was not being set correctly:

https://github.com/bazelbuild/bazel/blob/c9d58a8cbf4ac57bce32b852246c76e4cf61bb58/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java#L316

See
https://github.com/bazelbuild/bazel/commit/f54c2aeec89e9de176815ce68a11f3f8dbe50c93
which fixed another case where the builder pattern led to code not being updated
correctly.

PiperOrigin-RevId: 284081002