diff --git a/core/main.mk b/core/main.mk index dd5cfa3fe..da0554810 100644 --- a/core/main.mk +++ b/core/main.mk @@ -330,13 +330,15 @@ ifneq (,$(user_variant)) enable_target_debugging := endif - # Turn on Dalvik preoptimization for user builds, but only if not + # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not # explicitly disabled and the build is running on Linux (since host # Dalvik isn't built for non-Linux hosts). ifeq (,$(WITH_DEXPREOPT)) - ifeq ($(user_variant),user) - ifeq ($(HOST_OS),linux) - WITH_DEXPREOPT := true + ifeq ($(DALVIK_VM_LIB),libdvm.so) + ifeq ($(user_variant),user) + ifeq ($(HOST_OS),linux) + WITH_DEXPREOPT := true + endif endif endif endif