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

Commit a47d12e3 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"

parents 6e8ffe3f 9db168ca

core/dex_preopt_odex_install.mk

+7 −9
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ifneq (true,$(WITH_DEXPREOPT)) 
  LOCAL_DEX_PREOPT :=

else # WITH_DEXPREOPT=true

  ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty

    ifneq (,$(LOCAL_SRC_FILES)) # LOCAL_SRC_FILES not empty

    ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined

      ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty

        LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
@@ -16,7 +15,6 @@ else # WITH_DEXPREOPT=true 
        LOCAL_DEX_PREOPT := nostripping

      endif # LOCAL_APK_LIBRARIES not empty

    endif # LOCAL_DEX_PREOPT undefined

    endif # LOCAL_SRC_FILES not empty

  endif # TARGET_BUILD_APPS empty

endif # WITH_DEXPREOPT=true

ifeq (false,$(LOCAL_DEX_PREOPT))

target/product/base.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \ 
    dhcpcd-run-hooks \

    dnsmasq \

    framework \

    framework2 \

    fsck_msdos \

    ime \

    javax.obex \