commit c928de90ad22ecdf83c18a07008409595f13d3b1
author Ian Rogers <irogers@google.com> Wed Feb 27 14:30:44 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Feb 27 14:30:44 2013 -0800
tree 065a08f379960f7ba946318aaa742d7ddd0c94bd
parent 0f827169742aad6209d830db773a101849c32a83

Remove Iceland.

ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER
is used in #ifdefs.

Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index d00af79..703a5a1 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -249,7 +249,7 @@
                                               dump_stats,
                                               dump_timings));
 
-    if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)) {
+    if (compiler_backend_ == kPortable) {
       compiler->SetBitcodeFileName(bitcode_filename);
     }
 
@@ -603,7 +603,7 @@
   }
 
   static const unsigned int kWatchDogWarningSeconds = 1 * 60;  // 1 minute.
-#ifdef ART_USE_LLVM_COMPILER
+#ifdef ART_USE_PORTABLE_COMPILER
   static const unsigned int kWatchDogTimeoutSeconds = 30 * 60;  // 25 minutes + buffer.
 #else
   static const unsigned int kWatchDogTimeoutSeconds = 3 * 60;  // 2 minutes + buffer.
@@ -647,8 +647,6 @@
   bool support_debugging = false;
 #if defined(ART_USE_PORTABLE_COMPILER)
   CompilerBackend compiler_backend = kPortable;
-#elif defined(ART_USE_LLVM_COMPILER)
-  CompilerBackend compiler_backend = kIceland;
 #else
   CompilerBackend compiler_backend = kQuick;
 #endif
@@ -734,9 +732,6 @@
         compiler_backend = kQuick;
       } else if (backend_str == "QuickGBC") {
         compiler_backend = kQuickGBC;
-      } else if (backend_str == "Iceland") {
-        // TODO: remove this when Portable/Iceland merge complete
-        compiler_backend = kIceland;
       } else if (backend_str == "Portable") {
         compiler_backend = kPortable;
       }