From d235ed2afb29101cc3e03e7bb692637ad67b48ad Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 28 Jun 2013 13:37:27 -0700
Subject: Respect DISABLE_PROGUARD

The flag is only used by unbundled build currently.

Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
---
 core/package.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core')

diff --git a/core/package.mk b/core/package.mk
index 201235165..36fb54c1d 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -130,11 +130,13 @@ LOCAL_BUILT_MODULE_STEM := package.apk
 
 LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))
 ifndef LOCAL_PROGUARD_ENABLED
+ifneq ($(DISABLE_PROGUARD),true)
 ifneq ($(filter user userdebug, $(TARGET_BUILD_VARIANT)),)
     # turn on Proguard by default for user & userdebug build
     LOCAL_PROGUARD_ENABLED :=full
 endif
 endif
+endif
 ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
     # the package explicitly request to disable proguard.
     LOCAL_PROGUARD_ENABLED :=
-- 
cgit v1.2.3