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

Commit 4f5d0e60 authored by Ying Wang's avatar Ying Wang
Browse files

Raise SDK version for ProGuard processing when app links support library. 

When an app's LOCAL_SDK_VERSION is lower than the support library's
LOCAL_SDK_VERSION,  we artifically raises the "SDK version" "linked"
by ProGuard, to
- suppress ProGuard warnings of referencing symbols unknown to the
  lower SDK version.
- prevent ProGuard stripping subclass in the support library that
  extends class added in the higher SDK version.

This allows us to remove the dangerous ProGuard flag
"-dontwarn android.support.**".

Notes:
- We don't raise the app's LOCAL_SDK_VERSION, so that the app's own
  code is still unable to use the higher SDK version.
- For platform build, we can't just raise to the "current" SDK,
  because would break apps that use APIs removed from the current SDK.
  We raise it to framework.jar instead, which contains the most complete
  symbol set.

Bug: 20658265
Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7
(cherry picked from commit 8e8d1e7a)
parent 5c73ba6e

core/java.mk

+23 −2
Original line number Diff line number Diff line
@@ -432,8 +432,29 @@ ifneq ($(filter-out full custom nosystem obfuscation optimization shrinktests,$( 
    $(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))

endif

proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary



# Hack: see b/20667396

# When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION,

# we artifically raises the "SDK version" "linked" by ProGuard, to

# - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version.

# - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version.

my_support_library_sdk_raise :=

ifneq (,$(filter android-support-%,$(LOCAL_STATIC_JAVA_LIBRARIES)))

ifdef LOCAL_SDK_VERSION

ifeq (,$(filter current system_current, $(LOCAL_SDK_VERSION)))

ifdef TARGET_BUILD_APPS

  my_support_library_sdk_raise := $(call java-lib-files, sdk_vcurrent)

else

  # For platform build, we can't just raise to the "current" SDK,

  # that would break apps that use APIs removed from the current SDK.

  my_support_library_sdk_raise := $(call java-lib-files,framework)

endif

endif

endif

endif



# jack already has the libraries in its classpath and doesn't support jars

legacy_proguard_flags := $(addprefix -libraryjars ,$(full_shared_java_libs))

legacy_proguard_flags := $(addprefix -libraryjars ,$(my_support_library_sdk_raise) $(full_shared_java_libs))

common_proguard_flags :=  \

                  -forceprocessing \

                  -printmapping $(proguard_dictionary)
@@ -501,7 +522,7 @@ extra_input_jar := 
endif

$(full_classes_proguard_jar): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)

$(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)

$(full_classes_proguard_jar) : $(full_classes_jar) $(extra_input_jar) $(proguard_flag_files) | $(ACP) $(PROGUARD)

$(full_classes_proguard_jar) : $(full_classes_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(proguard_flag_files) | $(ACP) $(PROGUARD)

	$(call transform-jar-to-proguard)



else  # LOCAL_PROGUARD_ENABLED not defined

core/proguard_basic_keeps.flags

+6 −1
Original line number Diff line number Diff line
@@ -58,7 +58,12 @@ 
# Don't warn about those in case this app is linking against an older

# platform version.  We know about them, and they are safe.

# See proguard-android.txt in the SDK package.

-dontwarn android.support.**

#

# DO NOT USE THIS: We figured it's dangerous to blindly ignore all support library warnings.

# ProGuard may strip members of subclass of unknown super classes, in case an app is linking against

# LOCAL_SDK_VERSION lower than the support library's LOCAL_SDK_VERSION.

# See bug/20658265.

# -dontwarn android.support.**



# Less spammy.

-dontnote