diff options
| author | Ying Wang <wangying@google.com> | 2013-06-28 13:43:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 13:43:25 -0700 |
| commit | f755fa0d8c46a907aa457c55a8164141975467da (patch) | |
| tree | 99d99679207653edc3421e8035afb99e6613e5fb /core | |
| parent | 92ad5881b51c6762f71ced36b2ba34f3afe5b765 (diff) | |
| parent | d235ed2afb29101cc3e03e7bb692637ad67b48ad (diff) | |
| download | build-f755fa0d8c46a907aa457c55a8164141975467da.tar.gz build-f755fa0d8c46a907aa457c55a8164141975467da.tar.bz2 build-f755fa0d8c46a907aa457c55a8164141975467da.zip | |
am d235ed2a: Respect DISABLE_PROGUARD
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
Diffstat (limited to 'core')
| -rw-r--r-- | core/package.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 := |