commit bba6263203c25b37cf75a8b103862629f3290e72
author Ying Wang <wangying@google.com> Thu May 23 10:26:49 2013 -0700
committer Ying Wang <wangying@google.com> Thu May 23 10:26:49 2013 -0700
tree 6bf8b19a2da7a99bbc234320f5dd5203a69c29f9
parent efdfb7d8933484d83e4401ad6b1b2eae8d8af46d

Enable Proguard for eng build too.

With this change, all build variants are now with Proguard enabled,
unless you explicitly set DISABLE_PROGUARD to true.

Change-Id: I0f9b566b5ab3c3d961ffd6ab696e573bc59553b0

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 2012351..ff202cb 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -130,8 +130,7 @@
 
 LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))
 ifndef LOCAL_PROGUARD_ENABLED
-ifneq ($(filter user userdebug, $(TARGET_BUILD_VARIANT)),)
-    # turn on Proguard by default for user & userdebug build
+ifneq ($(DISABLE_PROGUARD),true)
     LOCAL_PROGUARD_ENABLED :=full
 endif
 endif