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

Commit 094ab99f authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img" 

* commit 'bc3b9801':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
parents baad790d bc3b9801

core/dex_preopt_odex_install.mk

+7 −5
Original line number Original line Diff line number Diff line
@@ -9,11 +9,13 @@ ifneq (true,$(WITH_DEXPREOPT)) 
else # WITH_DEXPREOPT=true

else # WITH_DEXPREOPT=true

  ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty

  ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty

    ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined

    ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined

      ifneq ($(filter $(TARGET_OUT)/%,$(my_module_path)),) # Installed to system.img.

        ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty

        ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty

          LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)

          LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)

        else # LOCAL_APK_LIBRARIES not empty

        else # LOCAL_APK_LIBRARIES not empty

          LOCAL_DEX_PREOPT := nostripping

          LOCAL_DEX_PREOPT := nostripping

        endif # LOCAL_APK_LIBRARIES not empty

        endif # LOCAL_APK_LIBRARIES not empty

      endif # Installed to system.img.

    endif # LOCAL_DEX_PREOPT undefined

    endif # LOCAL_DEX_PREOPT undefined

  endif # TARGET_BUILD_APPS empty

  endif # TARGET_BUILD_APPS empty

endif # WITH_DEXPREOPT=true

endif # WITH_DEXPREOPT=true