commit 221cf4435df4373a6c2d4a3cfc4abd76f1233c81
author Ian Rogers <irogers@google.com> Mon Sep 17 15:45:49 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 17 15:45:49 2012 -0700
tree 200baff9a0a6b228833ed8da1693e95b0349d0cd
parent df6e4ee4dcf7d6523513d0198a4885d960b51774
parent 506de0cfe98c10b908d2ddb119bbb201542cbfcd

Merge "Make unlikely check always on, move hot code to header file." into dalvik-dev

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index f031562..a8d313a 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -14,7 +14,20 @@
 # limitations under the License.
 #
 
-# TODO: move the LLVM compiler out into a separate shared library too...
+ART_USE_PORTABLE_COMPILER := false
+ifneq ($(wildcard art/USE_PORTABLE_COMPILER),)
+$(info Enabling ART_USE_PORTABLE_COMPILER because of existence of art/USE_PORTABLE_COMPILER)
+ART_USE_PORTABLE_COMPILER := true
+endif
+ifeq ($(WITH_ART_USE_PORTABLE_COMPILER),true)
+$(info Enabling ART_USE_PORTABLE_COMPILER because WITH_ART_USE_PORTABLE_COMPILER=true)
+ART_USE_PORTABLE_COMPILER := true
+endif
+ifeq ($(ART_USE_PORTABLE_COMPILER),true)
+WITH_ART_USE_QUICK_COMPILER := true
+WITH_ART_USE_LLVM_COMPILER := true
+endif
+
 # Use llvm as the backend
 ART_USE_LLVM_COMPILER := false
 ifneq ($(wildcard art/USE_LLVM_COMPILER),)