oops, wrong AssetExtract.java

zworkb · zworkb · commit bae9d583a29e · 2020-03-25T15:16:14.000+01:00
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -141,7 +141,6 @@ def prepare_build_dir(self):
         '''Ensure that a build dir exists for the recipe. This same single
         dir will be used for building all different archs.'''
         self.build_dir = self.get_build_dir()
-        self.common_dir = self.get_common_dir()
 
         # get all bootstrap names along the inheritance path
         bootstrap_names = []
@@ -165,10 +164,6 @@ def prepare_build_dir(self):
             print(f"copying {bootstrap_dir}")
             copy_files(join(bootstrap_dir, 'build'), self.build_dir)
 
-        # copy_files(join(self.bootstrap_dir, 'build'), self.build_dir)
-        # copy_files(join(self.common_dir, 'build'), self.build_dir,
-        #            override=False)
-
         if self.ctx.symlink_java_src:
             # XXX: has also to be generalized as for the copy stuff above
             info('Symlinking java src instead of copying')
diff --git a/pythonforandroid/bootstraps/library/build/src/main/java/org/renpy/android/AssetExtract.java b/pythonforandroid/bootstraps/library/build/src/main/java/org/renpy/android/AssetExtract.java
@@ -4,7 +4,7 @@
 
 import java.io.*;
 
-import android.app.Activity;
+import android.content.Context;
 import android.util.Log;
 
 import java.io.BufferedInputStream;
@@ -24,11 +24,11 @@
 public class AssetExtract {
 
     private AssetManager mAssetManager = null;
-    private Activity mActivity = null;
+    private Context ctx = null;
 
-    public AssetExtract(Activity act) {
-        mActivity = act;
-        mAssetManager = act.getAssets();
+    public AssetExtract(Context context) {
+        ctx = context;
+        mAssetManager = ctx.getAssets();
     }
 
     public boolean extractTar(String asset, String target) {
