commit 47129556692e9e8bf10ef47b7bfc857f1aa47798
author Colin Cross <ccross@android.com> Thu Apr 06 20:24:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 20:24:36 2017 +0000
tree abdcca4cc4f204da8943475d815ea306dc48fc3b
parent 91dd50810cb99c2dc691c1d817eb3c11620c6ae8
parent 5cc452de6455016a93f4f4c7ea25859abbdd9807

Merge "Fix duplicate and dangling rules" am: f9f8b21af3 am: 50d2ffdfe3 am: 348d20bcce
am: 5cc452de64

Change-Id: I9779824859684b06476f1249f6c74fafbf3eaf4e

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.