commit f579b8edff13089e8c0144c7e5a6c834fb9c7313
author Dan Willemsen <dwillemsen@google.com> Fri Apr 07 21:47:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 07 21:47:31 2017 +0000
tree cda7669a5bdc5a310401cfe6f41eac990b34597a
parent 56202b9ca288ebeadd5576c46cc91117d086457d
parent 864955d152083e63b5c6904e41de56b8c05c8f59

Merge "Add LLNDK support for the VNDK" am: 2d6e79d268 am: 67eb8bb766 am: 7bc488c0ec
am: 864955d152

Change-Id: I473b4cfe8d47993ac455745089f9ed187f10f9f1

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.