Remove Iceland.
ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER
is used in #ifdefs.
Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55
diff --git a/src/class_linker.cc b/src/class_linker.cc
index 56c37fd..a00b4b9 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -57,7 +57,7 @@
#include "os.h"
#include "runtime.h"
#include "runtime_support.h"
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
#include "compiler_llvm/runtime_support_llvm.h"
#endif
#include "ScopedLocalRef.h"
@@ -2569,7 +2569,7 @@
method->SetCoreSpillMask(refs_and_args->GetCoreSpillMask());
method->SetFpSpillMask(refs_and_args->GetFpSpillMask());
method->SetFrameSizeInBytes(refs_and_args->GetFrameSizeInBytes());
-#if !defined(ART_USE_LLVM_COMPILER)
+#if !defined(ART_USE_PORTABLE_COMPILER)
method->SetCode(reinterpret_cast<void*>(art_quick_proxy_invoke_handler));
#else
OatFile::OatMethod oat_method = GetOatMethodFor(prototype.get());