tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don't feed framework.jar to proguard for vendor apks"

Browse source
This commit is contained in:
Treehugger Robot 2019-04-05 12:40:18 +00:00 committed by Gerrit Code Review
commit 639861ab66
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/java.mk
View file

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