TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use separate flags for 64-bit

Browse Source
This commit is contained in:
topjohnwu 2019-04-05 15:17:57 -04:00
parent 6a0b2ddee9
commit 6953cc2411
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.py
View File

@ -203,7 +203,7 @@ def build_binary(args):
base_flags += ' MAGISK_DEBUG=1' base_flags += ' MAGISK_DEBUG=1'
if 'magisk' in args.target: if 'magisk' in args.target:
run_ndk_build('B_MAGISK=1') run_ndk_build('B_MAGISK=1 B_64BIT=1')
# Dump the binary to header # Dump the binary to header
for arch in archs: for arch in archs:
bin_file = os.path.join('native', 'out', arch, 'magisk') bin_file = os.path.join('native', 'out', arch, 'magisk')
@ -231,7 +231,7 @@ def build_binary(args):
run_ndk_build('B_BOOT=1') run_ndk_build('B_BOOT=1')
if 'test' in args.target: if 'test' in args.target:
run_ndk_build('B_TEST=1') run_ndk_build('B_TEST=1 B_64BIT=1')
def build_apk(args, module): def build_apk(args, module):

4
native/jni/Application.mk
View File

@ -10,8 +10,8 @@ ifdef MAGISK_DEBUG
APP_CFLAGS += -D__MDBG APP_CFLAGS += -D__MDBG
endif endif
# Build 64 bit binaries for magisk # Build 64 bit binaries
ifdef B_MAGISK ifdef B_64BIT
APP_ABI += arm64-v8a x86_64 APP_ABI += arm64-v8a x86_64
endif endif