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

Commit 4a6b93ba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't feed framework.jar to proguard for vendor apks" into qt-dev

parents be0cb591 678ace7e

core/java.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -395,6 +395,13 @@ else 
  # that would break apps that use APIs removed from the current SDK.

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

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

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

endif

endif

ifdef BOARD_SYSTEMSDK_VERSIONS

ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

  # But for vendor or odm apks, don't raise SDK as the apks are required to

  # use SDK APIs only

  my_proguard_sdk_raise :=

endif

endif

endif

endif





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

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