p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

am: 639861ab66

Change-Id: If99059d133395db0caa45ba0b94786d7495239a3
This commit is contained in:
Jiyong Park 2019-04-05 05:56:01 -07:00 committed by android-build-merger
parent ae769f6391 639861ab66
commit 069b3833de
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.
my_proguard_sdk_raise := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))
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
legacy_proguard_flags := $(addprefix -libraryjars ,$(my_proguard_sdk_raise) \