commit e469ea36ffa88a4ee7e2a63228eae8be9e7083fb
author Brian Carlstrom <bdc@google.com> Thu May 29 16:37:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 29 16:37:20 2014 +0000
tree 40488c73ffdbef2d9c2ea8aad2280066f42c1d99
parent 5da48a33942f4378b64bca95d54e32b19ee07695
parent 9f8e214a919097284a88cb19a1b85ceafc202a67

am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so

* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e8169fc..6dbc8a6 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