commit 3f5ff08dc5cd3b3615d35a2bf1e6f89fefcc6657
author Brian Carlstrom <bdc@google.com> Wed May 28 22:13:07 2014 -0700
committer Brian Carlstrom <bdc@google.com> Thu May 29 09:38:04 2014 -0700
tree 59d1e5e727e993275276ff959d00170b88a35036
parent 1e60fe58f0a66c4281a9c0050ce4d706d342bd22

Only enable WITH_DEXPREOPT by default for libdvm.so

Bug: 14298175

(cherry picked from commit 9f8e214a919097284a88cb19a1b85ceafc202a67)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index b07d5a1..e3b7089 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -334,13 +334,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