commit 85ab497a4e9ee1b3cba653b06030c099fb7ca4e9
author Ying Wang <wangying@google.com> Fri Feb 19 18:39:13 2010 -0800
committer Ying Wang <wangying@google.com> Fri Feb 19 18:39:13 2010 -0800
tree 4326d8c764dd932002e950f235c7a2c52f3d225e
parent 577c5ba9f4fd81e057d8c671772a16bc2719a9b3

Turn on Proguard by default for user/userdebug builds.

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index fc28abf..bc81eae 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -218,6 +218,9 @@
 endif # test package
 
 LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))
+ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
+    LOCAL_PROGUARD_ENABLED :=
+endif
 ifneq ($(LOCAL_PROGUARD_ENABLED),)
 ifeq ($(LOCAL_PROGUARD_ENABLED),full)
     # full

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 07bb3f9..c17b35b 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -127,7 +127,16 @@
 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
+    LOCAL_PROGUARD_ENABLED :=full
+endif
+endif
+ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
+    # the package explicitly request to disable proguard.
+    LOCAL_PROGUARD_ENABLED :=
+endif
 proguard_options_file :=
 ifneq ($(LOCAL_PROGUARD_ENABLED),custom)
 ifneq ($(all_resources),)