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

Proper build scripts

Browse Source
This commit is contained in:
topjohnwu 2022-07-24 05:39:14 -07:00
parent b9e89a1a2d
commit a7ab8216ce
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@ -231,10 +231,11 @@ def run_cargo_build(args):
env['CARGO_BUILD_RUSTC'] = op.join(rust_bin, 'rustc' + EXE_EXT) env['CARGO_BUILD_RUSTC'] = op.join(rust_bin, 'rustc' + EXE_EXT)
# Install cxxbridge and generate C++ bindings # Install cxxbridge and generate C++ bindings
native_out = op.join('..', '..', 'native', 'out') native_out = op.join('..', 'out')
cxx_src = op.join('external', 'cxx-rs', 'gen', 'cmd')
local_cargo_root = op.join(native_out, '.cargo') local_cargo_root = op.join(native_out, '.cargo')
mkdir_p(local_cargo_root) mkdir_p(local_cargo_root)
cmds = [cargo, 'install', '--root', local_cargo_root, 'cxxbridge-cmd'] cmds = [cargo, 'install', '--root', local_cargo_root, '--path', cxx_src]
if not args.verbose: if not args.verbose:
cmds.append('-q') cmds.append('-q')
proc = execv(cmds, env) proc = execv(cmds, env)

8
native/src/Android-rs.mk
View File

@ -4,22 +4,30 @@ LOCAL_PATH := $(call my-dir)
# Rust compilation outputs # Rust compilation outputs
########################### ###########################
ifdef B_MAGISK
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := magisk-rs LOCAL_MODULE := magisk-rs
LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagisk-rs.a LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagisk-rs.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif
ifdef B_BOOT
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := boot-rs LOCAL_MODULE := boot-rs
LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskboot-rs.a LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskboot-rs.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif
ifdef B_INIT
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := init-rs LOCAL_MODULE := init-rs
LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskinit-rs.a LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskinit-rs.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif
ifdef B_POLICY
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := policy-rs LOCAL_MODULE := policy-rs
LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskpolicy-rs.a LOCAL_SRC_FILES := ../out/$(TARGET_ARCH_ABI)/libmagiskpolicy-rs.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif