diff options
Diffstat (limited to 'platform_tools/android/apps/viewer')
3 files changed, 5 insertions, 3 deletions
diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle index d39e896c41..630544d0bb 100644 --- a/platform_tools/android/apps/viewer/build.gradle +++ b/platform_tools/android/apps/viewer/build.gradle @@ -24,7 +24,7 @@ android { } sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call sourceSets.main.jniLibs.srcDir "src/main/libs" - productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; } + productFlavors { universal{}; arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; } setupSkiaLibraryBuild(project, applicationVariants, "libviewer") } diff --git a/platform_tools/android/apps/viewer/src/main/assets/.gitignore b/platform_tools/android/apps/viewer/src/main/assets/.gitignore new file mode 100644 index 0000000000..e47e1b33a7 --- /dev/null +++ b/platform_tools/android/apps/viewer/src/main/assets/.gitignore @@ -0,0 +1 @@ +/resources diff --git a/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerApplication.java b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerApplication.java index 2dcce90e63..7253eb7503 100644 --- a/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerApplication.java +++ b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerApplication.java @@ -8,6 +8,7 @@ package org.skia.viewer; import android.app.Application; +import android.content.res.AssetManager; public class ViewerApplication extends Application { private long mNativeHandle = 0; @@ -18,13 +19,13 @@ public class ViewerApplication extends Application { System.loadLibrary("viewer"); } - private native long createNativeApp(); + private native long createNativeApp(AssetManager assetManager); private native void destroyNativeApp(long handle); @Override public void onCreate() { super.onCreate(); - mNativeHandle = createNativeApp(); + mNativeHandle = createNativeApp(this.getResources().getAssets()); } @Override |