@@ -426,15 +426,15 @@ def _do_get_build_type(self, str):
426
426
if build_64bit :
427
427
if build_other_arch :
428
428
print 'build 64bit and 32bit'
429
- return LuaBuildType .BUILD_32BIT_AND_64BIT
429
+ return self . LuaBuildType .BUILD_32BIT_AND_64BIT
430
430
else :
431
431
print 'only build 64bit'
432
- return LuaBuildType .ONLY_BUILD_64BIT
432
+ return self . LuaBuildType .ONLY_BUILD_64BIT
433
433
else :
434
434
print 'only build 32bit'
435
- return LuaBuildType .ONLY_BUILD_32BIT
435
+ return self . LuaBuildType .ONLY_BUILD_32BIT
436
436
437
- return LuaBuildType .UNKNOWN
437
+ return self . LuaBuildType .UNKNOWN
438
438
439
439
# check if arm64-v8a is set in Application.mk
440
440
def _get_build_type (self , param_of_appabi ):
@@ -450,10 +450,10 @@ def _get_build_type(self, param_of_appabi):
450
450
if line .find ('APP_ABI' ) == - 1 :
451
451
continue
452
452
build_type = self ._do_get_build_type (line )
453
- if build_type != LuaBuildType .UNKNOWN :
453
+ if build_type != self . LuaBuildType .UNKNOWN :
454
454
return build_type
455
455
456
- return LuaBuildType .UNKNOWN
456
+ return self . LuaBuildType .UNKNOWN
457
457
458
458
def do_build_apk (self , build_mode , no_apk , output_dir , custom_step_args , compile_obj ):
459
459
if self .use_studio :
@@ -493,27 +493,27 @@ def do_build_apk(self, build_mode, no_apk, output_dir, custom_step_args, compile
493
493
build_type = self ._get_build_type (compile_obj .app_abi )
494
494
495
495
# only build 64bit
496
- if build_type == LuaBuildType .ONLY_BUILD_64BIT :
496
+ if build_type == self . LuaBuildType .ONLY_BUILD_64BIT :
497
497
dst_dir = os .path .join (assets_dir , 'src/64bit' )
498
498
compile_obj .compile_lua_scripts (src_dir , dst_dir , True )
499
499
# remove unneeded lua files
500
500
compile_obj ._remove_file_with_ext (src_dir , '.lua' )
501
501
shutil .rmtree (os .path .join (src_dir , 'cocos' ))
502
502
503
503
# only build 32bit
504
- if build_type == LuaBuildType .ONLY_BUILD_32BIT :
504
+ if build_type == self . LuaBuildType .ONLY_BUILD_32BIT :
505
505
# build 32-bit bytecode
506
506
compile_obj .compile_lua_scripts (src_dir , src_dir , False )
507
507
508
508
# build 32bit and 64bit
509
- if build_type == LuaBuildType .BUILD_32BIT_AND_64BIT :
509
+ if build_type == self . LuaBuildType .BUILD_32BIT_AND_64BIT :
510
510
# build 64-bit bytecode
511
511
dst_dir = os .path .join (assets_dir , 'src/64bit' )
512
512
compile_obj .compile_lua_scripts (src_dir , dst_dir , True )
513
513
# build 32-bit bytecode
514
514
compile_obj .compile_lua_scripts (src_dir , src_dir , False )
515
515
516
- if build_type == LuaBuildType .UNKNOWN :
516
+ if build_type == self . LuaBuildType .UNKNOWN :
517
517
# haven't set APP_ABI in parameter and Application.mk, default build 32bit
518
518
compile_obj .compile_lua_scripts (src_dir , src_dir , False )
519
519
0 commit comments