status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-23 06:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

asset: hoist global variable to Go and make C function static

Browse Source 
Change-Id: I19d933bb49eba462371451ac3b258744c69b0aad
Reviewed-on: https://go-review.googlesource.com/124916
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Elias Naur 2018-07-19 09:31:05 +02:00
parent 56e3592fa7
commit c7f1239863
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
asset/asset_android.go
View File

@ -11,10 +11,7 @@ package asset
#include <jni.h>
#include <stdlib.h>
// asset_manager is the asset manager of the app.
AAssetManager* asset_manager;
void asset_manager_init(uintptr_t java_vm, uintptr_t jni_env, jobject ctx) {
static AAssetManager* asset_manager_init(uintptr_t java_vm, uintptr_t jni_env, jobject ctx) {
JavaVM* vm = (JavaVM*)java_vm;
JNIEnv* env = (JNIEnv*)jni_env;
@ -29,7 +26,7 @@ void asset_manager_init(uintptr_t java_vm, uintptr_t jni_env, jobject ctx) {
// Pin the AssetManager and load an AAssetManager from it.
am = (*env)->NewGlobalRef(env, am);
asset_manager = AAssetManager_fromJava(env, am);
return AAssetManager_fromJava(env, am);
}
*/
import "C"
@ -46,9 +43,12 @@ import (
var assetOnce sync.Once
// asset_manager is the asset manager of the app.
var assetManager *C.AAssetManager
func assetInit() {
err := mobileinit.RunOnJVM(func(vm, env, ctx uintptr) error {
C.asset_manager_init(C.uintptr_t(vm), C.uintptr_t(env), C.jobject(ctx))
assetManager = C.asset_manager_init(C.uintptr_t(vm), C.uintptr_t(env), C.jobject(ctx))
return nil
})
if err != nil {
@ -61,7 +61,7 @@ func openAsset(name string) (File, error) {
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
a := &asset{
ptr: C.AAssetManager_open(C.asset_manager, cname, C.AASSET_MODE_UNKNOWN),
ptr: C.AAssetManager_open(assetManager, cname, C.AASSET_MODE_UNKNOWN),
name: name,
}
if a.ptr == nil {