From: Brian Carlstrom <bdc@google.com>
Date: Thu, 29 May 2014 05:13:07 +0000 (-0700)
Subject: Only enable WITH_DEXPREOPT by default for libdvm.so
X-Git-Tag: android-x86-6.0-r1~1145^2~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f8e214a;p=android-x86%2Fbuild.git

Only enable WITH_DEXPREOPT by default for libdvm.so

Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
---

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