From 6953cc241155a0b1b00b4fe28283bc8620ef7aca Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 5 Apr 2019 15:17:57 -0400
Subject: [PATCH] Use separate flags for 64-bit

---
 build.py                  | 4 ++--
 native/jni/Application.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.py b/build.py
index 6293496e1..5fee4a0b1 100755
--- a/build.py
+++ b/build.py
@@ -203,7 +203,7 @@ def build_binary(args):
         base_flags += ' MAGISK_DEBUG=1'
 
     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
         for arch in archs:
             bin_file = os.path.join('native', 'out', arch, 'magisk')
@@ -231,7 +231,7 @@ def build_binary(args):
         run_ndk_build('B_BOOT=1')
 
     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):
diff --git a/native/jni/Application.mk b/native/jni/Application.mk
index cd88fed2a..ee8363d2f 100644
--- a/native/jni/Application.mk
+++ b/native/jni/Application.mk
@@ -10,8 +10,8 @@ ifdef MAGISK_DEBUG
 APP_CFLAGS += -D__MDBG
 endif
 
-# Build 64 bit binaries for magisk
-ifdef B_MAGISK
+# Build 64 bit binaries
+ifdef B_64BIT
 APP_ABI += arm64-v8a x86_64
 endif