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

Commit 0ab5cc6b authored by Mark Renouf's avatar Mark Renouf Committed by Android Git Automerger
Browse files

am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag 

* commit '99332f11':
  Allow for opt-in of proguard shrinking of tests with new flag
parents 03f8a4df 99332f11

core/java.mk

+4 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ $(full_classes_jar): $(full_classes_emma_jar) | $(ACP) 


# Run proguard if necessary, otherwise just copy the file.

ifdef LOCAL_PROGUARD_ENABLED

ifneq ($(filter-out full custom nosystem obfuscation optimization,$(LOCAL_PROGUARD_ENABLED)),)

ifneq ($(filter-out full custom nosystem obfuscation optimization shrinktests,$(LOCAL_PROGUARD_ENABLED)),)

    $(warning while processing: $(LOCAL_MODULE))

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

endif
@@ -395,6 +395,9 @@ endif 
# If this is a test package, add proguard keep flags for tests.

ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)

proguard_flags += -include $(BUILD_SYSTEM)/proguard_tests.flags

ifeq ($(filter shrinktests,$(LOCAL_PROGUARD_ENABLED)),)

proguard_flags += -dontshrink # don't shrink tests by default

endif # shrinktests

endif # test package

ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)

# By default no obfuscation

core/proguard_tests.flags

+2 −1
Original line number Diff line number Diff line 
# Keep everything for tests

-dontshrink

# 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.