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.h b/src/oat.h
index 1d2db6c..b4747d4 100644
--- a/src/oat.h
+++ b/src/oat.h
@@ -80,7 +80,7 @@
uint32_t vmap_table_offset,
uint32_t gc_map_offset,
uint32_t invoke_stub_offset
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
, uint32_t proxy_stub_offset
#endif
);
@@ -96,7 +96,7 @@
uint32_t gc_map_offset_;
uint32_t invoke_stub_offset_;
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
uint32_t proxy_stub_offset_;
#endif
};