commit 94c7f1efc6f3f4772fc2b4fea1a5fd7c01fef747
author Colin Cross <ccross@android.com> Tue Aug 01 23:05:19 2017 -0700
committer Colin Cross <ccross@android.com> Tue Aug 01 23:21:56 2017 -0700
tree 1c80fbc87a76f9c2d193a58542d8f19cea2d0e47
parent 684e045dc0efca4d5a8f0ed4b28036444ff9385f

Add LOCAL_JAR_EXCLUDE_FILES := none to android-support-v13

android-support-v13 statically contains android-support-v4,
which statically contains android-support-compat and
android-support-media-compat.  If LOCAL_JAR_EXCLUDE_FILES is
not set to none then the R.class files in android-support-compat
and android-support-media-compat are stripped before they
make it into android-support-v13, which causes missing class
errors in proguard.

Test: m -j checkbuild
Change-Id: Ie5efffc4ae253da368bd0b2b4f4dc7d5e5531660

v13/Android.mk

diff --git a/v13/Android.mk b/v13/Android.mk
index 9411930..f697512 100644
--- a/v13/Android.mk
+++ b/v13/Android.mk
@@ -44,5 +44,6 @@
         android-support-annotations
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
+LOCAL_JAR_EXCLUDE_FILES := none
 include $(BUILD_STATIC_JAVA_LIBRARY)