diff options
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. |