commit 91dd50810cb99c2dc691c1d817eb3c11620c6ae8
author Colin Cross <ccross@android.com> Thu Apr 06 15:59:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 15:59:21 2017 +0000
tree dfbcff161f2dbeb1f4076686590b31e7a8118169
parent 73270fe40368a2aa6dda65977470343161d00d27
parent 99c83f2bdaa3fd5f7fd5c59a1772f85250d377c1

Merge "Rearrange java library outputs" am: 7b7363fffb am: a4435a5025 am: 09018269a8
am: 99c83f2bda

Change-Id: Idbc589e26fa095c4be692acf601ec8873d0d3a8f

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 4dec1a8..80686cc 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -171,9 +171,9 @@
 
 # if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar
 ifeq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
-aar_classes_jar = $(full_classes_proguard_jar)
-else
 aar_classes_jar = $(full_classes_jar)
+else
+aar_classes_jar = $(full_classes_pre_proguard_jar)
 endif
 
 # Rule to build AAR, archive including classes.jar, resource, etc.