From 70587a24fdec9a14192e57fe148aeb3374b10635 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 29 Oct 2014 09:35:19 -0700 Subject: [PATCH] ART: Fix multi-image testing Also, make an unknown compiler backend string fail dex2oat. Change-Id: I878aef47d3c2c84b8479420e1a7ea2852993de35 --- build/Android.oat.mk | 4 ++-- dex2oat/dex2oat.cc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 80a000bf1..bded51bf1 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -37,7 +37,7 @@ define create-core-oat-host-rules 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 @@ define create-core-oat-target-rules 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) diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index bdb2b513b..4f04e72f3 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -980,6 +980,8 @@ static int dex2oat(int argc, char** argv) { 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(); -- 2.11.0