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.cc b/src/oat.cc
index 79a16cf..145abc6 100644
--- a/src/oat.cc
+++ b/src/oat.cc
@@ -147,7 +147,7 @@
vmap_table_offset_(0),
gc_map_offset_(0),
invoke_stub_offset_(0)
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
, proxy_stub_offset_(0)
#endif
{}
@@ -160,7 +160,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
)
@@ -172,7 +172,7 @@
vmap_table_offset_(vmap_table_offset),
gc_map_offset_(gc_map_offset),
invoke_stub_offset_(invoke_stub_offset)
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
, proxy_stub_offset_(proxy_stub_offset)
#endif
{}