diff options
| author | Ying Wang <wangying@google.com> | 2010-02-01 09:51:23 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-02-11 13:41:10 -0800 |
| commit | 3b2bdf10338fb048fc749ce9f65a77f917f7d304 (patch) | |
| tree | b2a6336fa594f8bd025448d178866964f8c45360 /core/package.mk | |
| parent | 769835e0d9e6c448b191c21a2f6c5b10d8537b23 (diff) | |
| download | build-3b2bdf10338fb048fc749ce9f65a77f917f7d304.zip build-3b2bdf10338fb048fc749ce9f65a77f917f7d304.tar.gz build-3b2bdf10338fb048fc749ce9f65a77f917f7d304.tar.bz2 | |
Fix and enable proguard on packages.
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/package.mk b/core/package.mk index 388435a..07bb3f9 100644 --- a/core/package.mk +++ b/core/package.mk @@ -126,10 +126,15 @@ endif LOCAL_BUILT_MODULE_STEM := package.apk -proguard_options_file := $(package_expected_intermediates_COMMON)/proguard_options -ifneq ($(strip $(LOCAL_PROGUARD_ENABLED)),custom) - LOCAL_PROGUARD_FLAGS := -include $(proguard_options_file) $(LOCAL_PROGUARD_FLAGS) -endif +LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED)) + +proguard_options_file := +ifneq ($(LOCAL_PROGUARD_ENABLED),custom) +ifneq ($(all_resources),) + proguard_options_file := -include $(package_expected_intermediates_COMMON)/proguard_options +endif # all_resources +endif # !custom +LOCAL_PROGUARD_FLAGS := $(proguard_options_file) $(LOCAL_PROGUARD_FLAGS) # The dex files go in the package, so we don't # want to install them separately for this module. |