commit e9571e429ec4c395cf6bb40a279db9718f13c92b
author Tao Bao <tbao@google.com> Thu Apr 06 21:10:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 21:10:35 2017 +0000
tree 7d387cad0a72928041780bba8884aa9db825ef1a
parent 47129556692e9e8bf10ef47b7bfc857f1aa47798
parent f859165bd1fc427d5f8df3c9bd3a522e1e53008a

Merge "releasetools: Add validate_target_files.py." am: 6cb177f15c am: c23d275d02 am: d5244a593f
am: f859165bd1

Change-Id: I0170fcec6a561a9af42d1d67b98cfb6311a4180b

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.