From 9f8e214a919097284a88cb19a1b85ceafc202a67 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 28 May 2014 22:13:07 -0700 Subject: [PATCH] Only enable WITH_DEXPREOPT by default for libdvm.so Bug: 14298175 Change-Id: I42255a61667f88924a779fff1812134044c7b6b2 --- core/main.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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