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/oat_writer.cc b/src/oat_writer.cc
index 6fcea5d..5e2b30c 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -244,7 +244,7 @@
uint32_t gc_map_offset = 0;
// derived from CompiledInvokeStub if available
uint32_t invoke_stub_offset = 0;
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
uint32_t proxy_stub_offset = 0;
#endif
@@ -358,7 +358,7 @@
}
}
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
if (type != kStatic) {
const CompiledInvokeStub* compiled_proxy_stub = compiler_->FindProxyStub(shorty);
if (compiled_proxy_stub != NULL) {
@@ -393,7 +393,7 @@
vmap_table_offset,
gc_map_offset,
invoke_stub_offset
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
, proxy_stub_offset
#endif
);
@@ -737,7 +737,7 @@
}
}
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
if (!is_static) {
const CompiledInvokeStub* compiled_proxy_stub = compiler_->FindProxyStub(shorty);
if (compiled_proxy_stub != NULL) {