commit 9f8e214a919097284a88cb19a1b85ceafc202a67
author Brian Carlstrom <bdc@google.com> Wed May 28 22:13:07 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed May 28 22:13:07 2014 -0700
tree 28fe0046dc8abd6b126b1b945cdbd283cf790ee0
parent bf8a374a92e327efed95892fe67e6917a89c6c2b

Only enable WITH_DEXPREOPT by default for libdvm.so

Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index dd5cfa3..da05548 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -330,13 +330,15 @@
     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