summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/Android.common.mk15
1 files changed, 14 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index f031562692..a8d313ae6f 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),)