Merge pull request kivy#2182 from AndreMiras/feature/share_asset_extract

AndreMiras · web-flow · commit 9f9a42fc5e9a · 2020-05-09T20:36:56.000+02:00
Reuse common AssetExtract.java
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -132,9 +132,6 @@ def get_build_dir(self):
     def get_dist_dir(self, name):
         return join(self.ctx.dist_dir, name)
 
-    def get_common_dir(self):
-        return os.path.abspath(join(self.bootstrap_dir, "..", 'common'))
-
     @property
     def name(self):
         modname = self.__class__.__module__
diff --git a/pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/AssetExtract.java b/pythonforandroid/bootstraps/common/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,9 @@
 public class AssetExtract {
 
     private AssetManager mAssetManager = null;
-    private Activity mActivity = null;
 
-    public AssetExtract(Activity act) {
-        mActivity = act;
-        mAssetManager = act.getAssets();
+    public AssetExtract(Context context) {
+        mAssetManager = context.getAssets();
     }
 
     public boolean extractTar(String asset, String target) {
diff --git a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/renpy/android/AssetExtract.java b/pythonforandroid/bootstraps/service_library/build/src/main/java/org/renpy/android/AssetExtract.java
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
@@ -104,9 +104,6 @@ def test_build_dist_dirs(self):
             bs.get_build_dir().endswith("build/bootstrap_builds/sdl2")
         )
         self.assertTrue(bs.get_dist_dir("test_prj").endswith("dists/test_prj"))
-        self.assertTrue(
-            bs.get_common_dir().endswith("pythonforandroid/bootstraps/common")
-        )
 
     def test__cmp_bootstraps_by_priority(self):
         # Test service_only has higher priority than sdl2:

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,6 @@ def test_build_dist_dirs(self):`
`104`	`104`	`bs.get_build_dir().endswith("build/bootstrap_builds/sdl2")`
`105`	`105`	`)`
`106`	`106`	`self.assertTrue(bs.get_dist_dir("test_prj").endswith("dists/test_prj"))`
`107`		`- self.assertTrue(`
`108`		`- bs.get_common_dir().endswith("pythonforandroid/bootstraps/common")`
`109`		`- )`
`110`	`107`
`111`	`108`	`def test__cmp_bootstraps_by_priority(self):`
`112`	`109`	`# Test service_only has higher priority than sdl2:`