Viewer/Amdroid: universal build, resources in APK

Change-Id: I57dda6e3329dbee720333b6e92142fce28f8dbd3
Reviewed-on: https://skia-review.googlesource.com/111940
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Yuqian Li <liyuqian@google.com>

1 files changed, 3 insertions, 2 deletions

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