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

Commit e06dbb7a authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

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

parents bc50bb88 03befa00
Loading
Loading
Loading
Loading
+9 −3
Original line number Original line Diff line number Diff line
@@ -47,15 +47,21 @@ ifeq (true,$(DISABLE_PREOPT))
  LOCAL_DEX_PREOPT :=
  LOCAL_DEX_PREOPT :=
endif
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,
# 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
# 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
# generally disabled (the check may fail due to various unrelated reasons, such
# as a failure to get manifest from an APK).
# as a failure to get manifest from an APK).
ifneq (true,$(WITH_DEXPREOPT))
ifneq (true,$(WITH_DEXPREOPT))
  LOCAL_ENFORCE_USES_LIBRARIES := false
  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
endif


ifdef LOCAL_UNINSTALLABLE_MODULE
ifdef LOCAL_UNINSTALLABLE_MODULE