StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out proguard_basic_keeps.flags

Browse Source 
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.

Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
This commit is contained in:
Ying Wang
2013-05-17 10:02:00 -07:00
parent 046ed25f52
commit 5745351908
3 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@@ -401,6 +401,8 @@ endif
ifneq ($(strip $(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS))$(filter android.test.runner,$(LOCAL_JAVA_LIBRARIES))),)
proguard_flags := $(proguard_flags) -include $(BUILD_SYSTEM)/proguard_tests.flags
endif # test package
else # LOCAL_PROGUARD_ENABLED is nosystem
proguard_flags += -include $(BUILD_SYSTEM)/proguard_basic_keeps.flags
endif # LOCAL_PROGUARD_ENABLED is not nosystem
ifneq ($(LOCAL_PROGUARD_ENABLED),)