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

Commit 199c6f29 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled."... 

Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: e06dbb7a am: d0f58507

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

Change-Id: If1edc4321a2dcb9b4f5ed02532e248dfee352bac
parents 0958cbf7 d0f58507

core/dex_preopt_odex_install.mk

+9 −3
Original line number Diff line number Diff line
@@ -47,15 +47,21 @@ ifeq (true,$(DISABLE_PREOPT)) 
  LOCAL_DEX_PREOPT :=

endif



# Disable <uses-library> checks and preopt if not WITH_DEXPREOPT

#

# Disable preopt if not WITH_DEXPREOPT

ifneq (true,$(WITH_DEXPREOPT))

  LOCAL_DEX_PREOPT :=

endif



# Disable <uses-library> checks 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 (true,$(WITH_DEXPREOPT))

  LOCAL_ENFORCE_USES_LIBRARIES := false

  LOCAL_DEX_PREOPT :=

endif

ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))

  LOCAL_ENFORCE_USES_LIBRARIES := false

endif



ifdef LOCAL_UNINSTALLABLE_MODULE