@@ -21,31 +21,28 @@ def assemble_distribution(self):
21
21
with open ('local.properties' , 'w' ) as fileh :
22
22
fileh .write ('sdk.dir={}' .format (self .ctx .sdk_dir ))
23
23
24
- arch = self .ctx .archs [0 ]
25
- if len (self .ctx .archs ) > 1 :
26
- raise ValueError ('built for more than one arch, but bootstrap cannot handle that yet' )
27
- info ('Bootstrap running with arch {}' .format (arch ))
28
-
29
24
with current_directory (self .dist_dir ):
30
25
info ('Copying python distribution' )
31
26
32
- self .distribute_libs (arch , [self .ctx .get_libs_dir (arch .arch )])
33
- self .distribute_aars (arch )
34
27
self .distribute_javaclasses (self .ctx .javaclass_dir ,
35
28
dest_dir = join ("src" , "main" , "java" ))
36
29
37
- python_bundle_dir = join (f'_python_bundle__{ arch .arch } ' , '_python_bundle' )
38
- ensure_dir (python_bundle_dir )
39
- site_packages_dir = self .ctx .python_recipe .create_python_bundle (
40
- join (self .dist_dir , python_bundle_dir ), arch )
30
+ for arch in self .ctx .archs :
31
+ self .distribute_libs (arch , [self .ctx .get_libs_dir (arch .arch )])
32
+ self .distribute_aars (arch )
33
+
34
+ python_bundle_dir = join (f'_python_bundle__{ arch .arch } ' , '_python_bundle' )
35
+ ensure_dir (python_bundle_dir )
36
+ site_packages_dir = self .ctx .python_recipe .create_python_bundle (
37
+ join (self .dist_dir , python_bundle_dir ), arch )
38
+ if not self .ctx .with_debug_symbols :
39
+ self .strip_libraries (arch )
40
+ self .fry_eggs (site_packages_dir )
41
41
42
42
if 'sqlite3' not in self .ctx .recipe_build_order :
43
43
with open ('blacklist.txt' , 'a' ) as fileh :
44
44
fileh .write ('\n sqlite3/*\n lib-dynload/_sqlite3.so\n ' )
45
45
46
- if not self .ctx .with_debug_symbols :
47
- self .strip_libraries (arch )
48
- self .fry_eggs (site_packages_dir )
49
46
super ().assemble_distribution ()
50
47
51
48
0 commit comments