commit 63bc11efaac0c041e849ab401f9fc368631a00f5
author Ian Rogers <irogers@google.com> Thu Sep 18 08:56:45 2014 -0700
committer Ian Rogers <irogers@google.com> Thu Sep 18 10:33:39 2014 -0700
tree b342dec2f39a0242a9f4e573eec06c77739a2643
parent b87baed15b03e2c853e285253ac92391572502f8

DO NOT MERGE. Only have a portable entrypoint in portable builds.

Bug: 16214885

Change-Id: Iff7b7415efdbdabd7e6020e221a540f6a774c852

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 60d641e..c76390b 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1192,10 +1192,14 @@
   method->SetDexMethodIndex(DexFile::kDexNoIndex);
   // When compiling, the code pointer will get set later when the image is loaded.
   if (runtime->IsCompiler()) {
+#if defined(ART_USE_PORTABLE_COMPILER)
     method->SetEntryPointFromPortableCompiledCode(nullptr);
+#endif
     method->SetEntryPointFromQuickCompiledCode(nullptr);
   } else {
+#if defined(ART_USE_PORTABLE_COMPILER)
     method->SetEntryPointFromPortableCompiledCode(class_linker->GetPortableImtConflictTrampoline());
+#endif
     method->SetEntryPointFromQuickCompiledCode(class_linker->GetQuickImtConflictTrampoline());
   }
   return method.Get();
@@ -1212,10 +1216,14 @@
   method->SetDexMethodIndex(DexFile::kDexNoIndex);
   // When compiling, the code pointer will get set later when the image is loaded.
   if (runtime->IsCompiler()) {
+#if defined(ART_USE_PORTABLE_COMPILER)
     method->SetEntryPointFromPortableCompiledCode(nullptr);
+#endif
     method->SetEntryPointFromQuickCompiledCode(nullptr);
   } else {
+#if defined(ART_USE_PORTABLE_COMPILER)
     method->SetEntryPointFromPortableCompiledCode(class_linker->GetPortableResolutionTrampoline());
+#endif
     method->SetEntryPointFromQuickCompiledCode(class_linker->GetQuickResolutionTrampoline());
   }
   return method.Get();
@@ -1230,7 +1238,9 @@
   method->SetDeclaringClass(mirror::ArtMethod::GetJavaLangReflectArtMethod());
   // TODO: use a special method for callee saves
   method->SetDexMethodIndex(DexFile::kDexNoIndex);
+#if defined(ART_USE_PORTABLE_COMPILER)
   method->SetEntryPointFromPortableCompiledCode(nullptr);
+#endif
   method->SetEntryPointFromQuickCompiledCode(nullptr);
   DCHECK_NE(instruction_set_, kNone);
   return method.Get();