commit 560473c74cc3755b652f86a61039e4a12c08afe2
author Andreas Gampe <agampe@google.com> Wed Oct 29 17:38:09 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 29 17:38:09 2014 +0000
tree cda22f3057827eb85090ad0c83a884c8e65c51e7
parent af62cf99a1a4320157e1074c1e65c5fbb0320349
parent 70587a24fdec9a14192e57fe148aeb3374b10635

Merge "ART: Fix multi-image testing"

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 80a000b..bded51b 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -37,7 +37,7 @@
   core_pic_infix :=
 
   ifeq ($(1),optimizing)
-    core_compile_options += --compiler-backend=optimizing
+    core_compile_options += --compiler-backend=Optimizing
     core_infix := -optimizing
   endif
   ifeq ($(1),interpreter)
@@ -125,7 +125,7 @@
   core_pic_infix :=
 
   ifeq ($(1),optimizing)
-    core_compile_options += --compiler-backend=optimizing
+    core_compile_options += --compiler-backend=Optimizing
     core_infix := -optimizing
   endif
   ifeq ($(1),interpreter)

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index bdb2b51..4f04e72 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -980,6 +980,8 @@
         compiler_kind = Compiler::kOptimizing;
       } else if (backend_str == "Portable") {
         compiler_kind = Compiler::kPortable;
+      } else {
+        Usage("Unknown compiler backend: %s", backend_str.data());
       }
     } else if (option.starts_with("--compiler-filter=")) {
       compiler_filter_string = option.substr(strlen("--compiler-filter=")).data();