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

Remove obsolete proguard options

Browse Source 
LOCAL_PROGUARD_ENABLED := shrinktests is never set.
proguard_tests.flags is entirely comments.
proguard.emma.flags only references emma classes, but we use
jacoco now.

Test: m checkbuild
Change-Id: I84a59a8c1b66f75d7ccbaa7da8e937430b4490c8
This commit is contained in:
Colin Cross
2017-12-27 17:58:21 -08:00
parent 1d64623105
commit e4936e1c2d
3 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java.mk
View File

@@ -593,7 +593,7 @@ $(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COM
# Run proguard if necessary # Run proguard if necessary
ifdef LOCAL_PROGUARD_ENABLED ifdef LOCAL_PROGUARD_ENABLED
ifneq ($(filter-out full custom nosystem obfuscation optimization shrinktests,$(LOCAL_PROGUARD_ENABLED)),) ifneq ($(filter-out full custom nosystem obfuscation optimization,$(LOCAL_PROGUARD_ENABLED)),)
$(warning while processing: $(LOCAL_MODULE)) $(warning while processing: $(LOCAL_MODULE))
$(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED)) $(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
endif endif
@@ -634,15 +634,8 @@ common_proguard_flags := -forceprocessing
common_proguard_flag_files := common_proguard_flag_files :=
ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),) ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),)
common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.flags common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.flags
ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
common_proguard_flags += -include $(BUILD_SYSTEM)/proguard.emma.flags
endif
# If this is a test package, add proguard keep flags for tests.
ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),) ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
common_proguard_flag_files += $(BUILD_SYSTEM)/proguard_tests.flags
ifeq ($(filter shrinktests,$(LOCAL_PROGUARD_ENABLED)),)
common_proguard_flags += -dontshrink # don't shrink tests by default common_proguard_flags += -dontshrink # don't shrink tests by default
endif # shrinktests
endif # test package endif # test package
ifneq ($(LOCAL_PROGUARD_ENABLED),custom) ifneq ($(LOCAL_PROGUARD_ENABLED),custom)
ifdef LOCAL_USE_AAPT2 ifdef LOCAL_USE_AAPT2

4
core/proguard.emma.flags
View File

@@ -1,4 +0,0 @@
# Keep everything for the emma classes
-keep class com.vladium.** {
*;
}

26
core/proguard_tests.flags
View File

@@ -1,26 +0,0 @@
# Keep everything for tests
# This flag has been moved to the makefiles and is set for tests by default.
#-dontshrink
# But we may want to obfuscate if the main app gets obfuscated.
# This flag has been moved to the makefiles.
#-dontobfuscate
#-keep class * extends junit.framework.TestCase {
# public void test*();
#}
#-keepclasseswithmembers class * {
# public static void run();
# public static junit.framework.Test suite();
#}
# some AllTests don't include run().
#-keepclasseswithmembers class * {
# public static junit.framework.Test suite();
#}
#-keep class * extends junit.framework.TestSuite
#-keep class * extends android.app.Instrumentation
#-keep class * extends android.test.TestSuiteProvider