commit aa861666ed537389e335f586bc84fe8ddb9fb026
author Dan Sandler <dsandler@android.com> Tue Apr 21 10:24:32 2015 -0400
committer Dan Sandler <dsandler@android.com> Tue Apr 21 10:26:13 2015 -0400
tree 877ee8db0bfd453aa1445c3cf2157fe3ddfaf5ee
parent 954863ab9b0e1a859b0442a6a76adef087b05457

Fix build.

Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 77c5087..af23f11 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -283,7 +283,7 @@
     private static native void nativeWriteInterfaceToken(long nativePtr, String interfaceName);
     private static native void nativeEnforceInterface(long nativePtr, String interfaceName);
 
-    private static native long nativeGetAshmemSize(long nativePtr);
+    private static native long nativeGetBlobAshmemSize(long nativePtr);
 
     public final static Parcelable.Creator<String> STRING_CREATOR
              = new Parcelable.Creator<String>() {

core/jni/android_os_Parcel.cpp

diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index c2a9bbd..a3a0551 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -766,7 +766,7 @@
     {"getGlobalAllocSize",        "()J", (void*)android_os_Parcel_getGlobalAllocSize},
     {"getGlobalAllocCount",       "()J", (void*)android_os_Parcel_getGlobalAllocCount},
 
-    {"nativeGetAshmemSize",       "(J)J", (void*)android_os_Parcel_getAshmemSize},
+    {"nativeGetBlobAshmemSize",       "(J)J", (void*)android_os_Parcel_getBlobAshmemSize},
 };
 
 const char* const kParcelPathName = "android/os/Parcel";