summaryrefslogtreecommitdiffstats
path: root/core/package.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-05-23 10:26:49 -0700
committerYing Wang <wangying@google.com>2013-05-23 10:26:49 -0700
commitbba6263203c25b37cf75a8b103862629f3290e72 (patch)
tree6bf8b19a2da7a99bbc234320f5dd5203a69c29f9 /core/package.mk
parentefdfb7d8933484d83e4401ad6b1b2eae8d8af46d (diff)
downloadbuild-bba6263203c25b37cf75a8b103862629f3290e72.zip
build-bba6263203c25b37cf75a8b103862629f3290e72.tar.gz
build-bba6263203c25b37cf75a8b103862629f3290e72.tar.bz2
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
Diffstat (limited to 'core/package.mk')
-rw-r--r--core/package.mk3
1 files changed, 1 insertions, 2 deletions
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_BUILT_MODULE_STEM := package.apk
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