commit a55a59a4f5102c54a08aae0e2e3d38a5095666e1
author Nicolas Geoffray <ngeoffray@google.com> Thu May 10 15:00:13 2018 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu May 10 15:00:13 2018 +0100
tree 0c9c74b21f9951575807aae2f692a9fa049f9034
parent 618418af0993263c3d9ca833dfb36dd6a2c1b5aa

Move registration of AssetManager.mObject to zygote.

bug: 73865351
Test: m

Change-Id: I9d0f0c8ae016b8823246e25bfdbff0d4fd8eaae1

core/jni/android_util_AssetManager.cpp

diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 7fa2247..fa9f445 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -75,9 +75,8 @@
   jfieldID mLength;
 } gAssetFileDescriptorOffsets;
 
-static struct assetmanager_offsets_t {
-  jfieldID mObject;
-} gAssetManagerOffsets;
+// This is also used by asset_manager.cpp.
+assetmanager_offsets_t gAssetManagerOffsets;
 
 static struct {
   jfieldID native_ptr;