openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: d534e22d10 am: e6a4da4796 am: 8896b81e4d 

Original change: https://android-review.googlesource.com/c/platform/build/+/1615201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a52ace844ede85ab62770ba3d8d3815c9e1cceb
This commit is contained in:
Ulyana Trafimovich 2021-03-09 10:50:12 +00:00 committed by Automerger Merge Worker
parent bcace74d16 8896b81e4d
commit 3fb41ab4b7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/app_prebuilt_internal.mk
View File

@ -102,6 +102,15 @@ ifndef LOCAL_ENFORCE_USES_LIBRARIES
endif
endif
# Disable verify_uses_libraries check if dexpreopt is globally disabled.
# Without dexpreopt the check is not necessary, and although it is good to have,
# it is difficult to maintain on non-linux build platforms where dexpreopt is
# generally disabled (the check may fail due to various unrelated reasons, such
# as a failure to get manifest from an APK).
ifneq ($(WITH_DEXPREOPT),true)
LOCAL_ENFORCE_USES_LIBRARIES :=
endif
my_enforced_uses_libraries :=
ifdef LOCAL_ENFORCE_USES_LIBRARIES
my_enforced_uses_libraries := $(intermediates.COMMON)/enforce_uses_libraries.status