Remove unused reference to missing sun.misc.Unsafe method
am: 7664db57a5
Change-Id: Ifa6ec20fbb5f4bd5d7581aa93a5161c1c49d3aad
diff --git a/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java b/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
index 6a4787d..051fffc 100644
--- a/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
+++ b/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
@@ -73,10 +73,19 @@
UNSAFE.putByte(target, offset, value);
}
- static void copyMemory(
- byte[] src, long srcOffset, byte[] target, long targetOffset, long length) {
- UNSAFE.copyMemory(src, srcOffset, target, targetOffset, length);
- }
+ // BEGIN Android-removed
+ // This method doesn't exist in sun.misc.Unsafe in Android, and leaving the
+ // dangling reference causes soft-verification errors when a jarjar'd version
+ // of libprotobuf-java-lite is included in the bootclasspath:
+ // Soft verification failures in void com.android.framework.protobuf.UnsafeUtil.copyMemory(byte[], long, byte[], long, long)
+ // void com.android.framework.protobuf.UnsafeUtil.copyMemory(byte[], long, byte[], long, long): [0x7] couldn't find method sun.misc.Unsafe.copyMemory ([BJ[BJJ)V
+ // This method is unused in the current open-source implementation of the
+ // protobuf lite runtime, so just remove it for now.
+ //static void copyMemory(
+ // byte[] src, long srcOffset, byte[] target, long targetOffset, long length) {
+ // UNSAFE.copyMemory(src, srcOffset, target, targetOffset, length);
+ //}
+ // END Android-removed
static long getLong(byte[] target, long offset) {
return UNSAFE.getLong(target, offset);
