diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/NativeActivity.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index ccc9ae3..3238b82 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.AssetManager; import android.graphics.PixelFormat; import android.os.Build; import android.os.Bundle; @@ -52,7 +53,8 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private boolean mDestroyed; private native int loadNativeCode(String path, MessageQueue queue, - String internalDataPath, String externalDataPath, int sdkVersion); + String internalDataPath, String externalDataPath, int sdkVersion, + AssetManager assetMgr); private native void unloadNativeCode(int handle); private native void onStartNative(int handle); @@ -138,7 +140,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, mNativeHandle = loadNativeCode(path, Looper.myQueue(), getFilesDir().toString(), Environment.getExternalStorageAppFilesDirectory(ai.packageName).toString(), - Build.VERSION.SDK_INT); + Build.VERSION.SDK_INT, getAssets()); if (mNativeHandle == 0) { throw new IllegalArgumentException("Unable to load native library: " + path); diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 1070f08..73d9458 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -70,6 +70,7 @@ public final class AssetManager { // For communication with native code. private int mObject; + private int mNObject; // used by the NDK private StringBlock mStringBlocks[] = null; |