commit ff70a288a5a9c521955f02902321857a325d6e44
author corysmith <corysmith@google.com> Thu Aug 10 22:14:56 2017 +0200
committer Marcel Hlopko <hlopko@google.com> Fri Aug 11 12:56:31 2017 +0200
tree da553726e47c18cbca8d25a64494a33784046f31
parent d40b74a5a83447e2e70da69a8b0314ab0231daa4

Rename the aapt2 library to .apk, which is what aapt2 expects for static libraries.

RELNOTES: None
PiperOrigin-RevId: 164893197

src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 51db707..88a6e27 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -96,9 +96,9 @@
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_APK =
       fromTemplates("%{name}.ap_");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_AAPT2_LIBRARY_APK =
-      fromTemplates("%{name}_files/aapt2_library.ap_");
+      fromTemplates("%{name}_files/aapt2_library.apk");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_AAPT2_R_TXT =
-      fromTemplates("%{name}_symbols/r.aapt2.txt");
+      fromTemplates("%{name}_symbols/R.aapt2.txt");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_AAPT2_SOURCE_JAR =
       fromTemplates("%{name}_files/%{name}_resources_aapt2-src.jar");
   public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_SHRUNK_APK =