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

Commit 437bbed8 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I81796b45,Iaf585336 

* changes:
  Desugar default methods if required
  Always raise proguard libraries
parents 55ce60c2 6548d2a9

core/definitions.mk

+1 −3
Original line number Diff line number Diff line
@@ -2385,7 +2385,6 @@ $(if $(filter $(1),$(PLATFORM_VERSION_CODENAME)),10000,$(1)) 
endef



# --add-opens is required because desugar reflects via java.lang.invoke.MethodHandles.Lookup

# --desugar_try_with_resources_if_needed=false is needed due to b/63180735, b/63901645, b/63900665

define desugar-classes-jar

@echo Desugar: $@

@mkdir -p $(dir $@)
@@ -2398,8 +2397,7 @@ $(hide) $(JAVA) \ 
    -jar $(DESUGAR) \

    $(addprefix --bootclasspath_entry ,$(PRIVATE_BOOTCLASSPATH)) \

    $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \

    --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    --desugar_try_with_resources_if_needed=false \

    --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_MIN_SDK_VERSION)) \

    --allow_empty_bootclasspath \

    $(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \

    -i $< -o $@.tmp

core/java.mk

+13 −13
Original line number Diff line number Diff line
@@ -605,33 +605,33 @@ ifneq ($(filter-out full custom nosystem obfuscation optimization shrinktests,$( 
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

# When an app contains references to APIs that are not in the SDK specified by

# its LOCAL_SDK_VERSION for example added by support library or by runtime 

# classes added by desugar, we artifically raise 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)))

# See b/20667396

my_proguard_sdk_raise :=

ifdef LOCAL_SDK_VERSION

ifdef TARGET_BUILD_APPS

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

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

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

endif

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-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))

endif

  my_proguard_sdk_raise := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))

endif

endif



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

  $(filter-out $(my_support_library_sdk_raise), \

legacy_proguard_flags := $(addprefix -libraryjars ,$(my_proguard_sdk_raise) \

  $(filter-out $(my_proguard_sdk_raise), \

    $(full_java_bootclasspath_libs) \

    $(full_shared_java_header_libs)))



legacy_proguard_lib_deps := $(my_support_library_sdk_raise) \

  $(filter-out $(my_support_library_sdk_raise),$(full_shared_java_header_libs))

legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \

  $(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs))



legacy_proguard_flags += -printmapping $(proguard_dictionary)
@@ -729,7 +729,7 @@ ifneq ($(USE_R8),true) 
$(full_classes_proguard_jar): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)

$(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_pre_proguard_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) | $(PROGUARD)

$(full_classes_proguard_jar) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) | $(PROGUARD)

	$(call transform-jar-to-proguard)

else # !USE_R8

# Running R8 instead of Proguard, proguarded jar is actually the pre-Proguarded jar.