Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4936e1c authored by Colin Cross's avatar Colin Cross
Browse files

Remove obsolete proguard options 

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
parent 1d646231

core/java.mk

+1 −8
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ $(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COM 


# Run proguard if necessary

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))

    $(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))

endif
@@ -634,15 +634,8 @@ common_proguard_flags := -forceprocessing 
common_proguard_flag_files :=

ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),)

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)),)

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

endif # shrinktests

endif # test package

ifneq ($(LOCAL_PROGUARD_ENABLED),custom)

  ifdef LOCAL_USE_AAPT2

core/proguard.emma.flags

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# Keep everything for the emma classes

-keep class com.vladium.** {

  *;

}

core/proguard_tests.flags

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
# 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