From 3f5ff08dc5cd3b3615d35a2bf1e6f89fefcc6657 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 (cherry picked from commit 9f8e214a919097284a88cb19a1b85ceafc202a67) Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4 --- core/main.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index b07d5a11e2..e3b7089111 100644 --- a/core/main.mk +++ b/core/main.mk @@ -334,13 +334,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