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

Commit 8896b81e authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled."... 

Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: d534e22d am: e6a4da47

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd8bb59e9b5adb43564e2caf0accb6e892199915
parents 045e256f e6a4da47

core/app_prebuilt_internal.mk

+9 −0
Original line number Diff line number Diff line
@@ -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