commit f9cb17101418759a68081363d70e448667f279eb
author Ian Rogers <irogers@google.com> Thu Sep 18 18:47:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 18:47:52 2014 +0000
tree cb27402713fefd6bc85ddec8b1369b464e06ca6a
parent 069618219622b1a23a41f257acc8e1c8bb0eba2b
parent fd38456b982ce9812022fb68c72ea20d30b923d7

am fd38456b: DO NOT MERGE. Only have a portable entrypoint in portable builds.

* commit 'fd38456b982ce9812022fb68c72ea20d30b923d7':
  DO NOT MERGE. Only have a portable entrypoint in portable builds.

libart/src/main/java/java/lang/reflect/ArtMethod.java

diff --git a/libart/src/main/java/java/lang/reflect/ArtMethod.java b/libart/src/main/java/java/lang/reflect/ArtMethod.java
index 8ce158a..6d21f59 100644
--- a/libart/src/main/java/java/lang/reflect/ArtMethod.java
+++ b/libart/src/main/java/java/lang/reflect/ArtMethod.java
@@ -70,8 +70,9 @@
     /**
      * Method dispatch from portable compiled code invokes this pointer which may cause bridging
      * into quick compiled code or the interpreter.
+     * Uncomment to enable.
      */
-    private long entryPointFromPortableCompiledCode;
+    // private long entryPointFromPortableCompiledCode;
 
     /**
      * Method dispatch from quick compiled code invokes this pointer which may cause bridging