Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
6c229ffa
Commit
6c229ffa
authored
Oct 18, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update external sources
parent
cdc5d983
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
648 additions
and
28 deletions
+648
-28
.gitmodules
.gitmodules
+9
-3
Android.mk
jni/Android.mk
+10
-13
Android.mk
jni/external/Android.mk
+126
-9
bzip2
jni/external/bzip2
+1
-0
dtc
jni/external/dtc
+1
-1
lz4
jni/external/lz4
+1
-0
ndk-compression
jni/external/ndk-compression
+0
-1
xz
jni/external/xz
+1
-0
config.h
jni/external/xz_config/config.h
+498
-0
compress.c
jni/magiskboot/compress.c
+1
-1
No files found.
.gitmodules
View file @
6c229ffa
...
@@ -4,9 +4,6 @@
...
@@ -4,9 +4,6 @@
[submodule "jni/su"]
[submodule "jni/su"]
path = jni/su
path = jni/su
url = https://github.com/topjohnwu/MagiskSU.git
url = https://github.com/topjohnwu/MagiskSU.git
[submodule "jni/ndk-compression"]
path = jni/external/ndk-compression
url = https://github.com/topjohnwu/ndk-compression.git
[submodule "jni/magiskpolicy"]
[submodule "jni/magiskpolicy"]
path = jni/magiskpolicy
path = jni/magiskpolicy
url = https://github.com/topjohnwu/magiskpolicy.git
url = https://github.com/topjohnwu/magiskpolicy.git
...
@@ -19,3 +16,12 @@
...
@@ -19,3 +16,12 @@
[submodule "jni/external/dtc"]
[submodule "jni/external/dtc"]
path = jni/external/dtc
path = jni/external/dtc
url = https://github.com/dgibson/dtc
url = https://github.com/dgibson/dtc
[submodule "jni/external/lz4"]
path = jni/external/lz4
url = https://github.com/lz4/lz4.git
[submodule "jni/external/bzip2"]
path = jni/external/bzip2
url = https://github.com/nemequ/bzip2.git
[submodule "jni/external/xz"]
path = jni/external/xz
url = https://github.com/xz-mirror/xz.git
jni/Android.mk
View file @
6c229ffa
...
@@ -2,16 +2,14 @@ LOCAL_PATH := $(call my-dir)
...
@@ -2,16 +2,14 @@ LOCAL_PATH := $(call my-dir)
# Some handy paths
# Some handy paths
JNI_ROOT := jni
JNI_ROOT := jni
SELINUX_PATH := jni/external/selinux
EXT_PATH := jni/external
COMPRESS_LIB := jni/external/ndk-compression
SE_PATH := $(EXT_PATH)/selinux
DTC_PATH := jni/external/dtc
LIBSELINUX := $(SE_PATH)/libselinux/include
LIBSELINUX := $(SELINUX_PATH)/libselinux/include
LIBSEPOL := $(SE_PATH)/libsepol/include $(SE_PATH)/libsepol/cil/include
LIBSEPOL := $(SELINUX_PATH)/libsepol/include $(SELINUX_PATH)/libsepol/cil/include
LIBLZMA := $(EXT_PATH)/xz/src/liblzma/api
LIBZ := $(COMPRESS_LIB)/zlib
LIBLZ4 := $(EXT_PATH)/lz4/lib
LIBLZMA := $(COMPRESS_LIB)/xz/src/liblzma/api
LIBBZ2 := $(EXT_PATH)/bzip2
LIBLZ4 := $(COMPRESS_LIB)/lz4/lib
LIBFDT := $(EXT_PATH)/dtc/libfdt
LIBBZ2 := $(COMPRESS_LIB)/bzip2
LIBFDT := $(DTC_PATH)/libfdt
########################
########################
# Binaries
# Binaries
...
@@ -65,10 +63,9 @@ include $(BUILD_EXECUTABLE)
...
@@ -65,10 +63,9 @@ include $(BUILD_EXECUTABLE)
# magiskboot
# magiskboot
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_MODULE := magiskboot
LOCAL_MODULE := magiskboot
LOCAL_STATIC_LIBRARIES := lib
z lib
lzma liblz4 libbz2 libfdt
LOCAL_STATIC_LIBRARIES := liblzma liblz4 libbz2 libfdt
LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES := \
jni/include \
jni/include \
$(LIBZ) \
$(LIBLZMA) \
$(LIBLZMA) \
$(LIBLZ4) \
$(LIBLZ4) \
$(LIBBZ2) \
$(LIBBZ2) \
...
@@ -86,7 +83,7 @@ LOCAL_SRC_FILES := \
...
@@ -86,7 +83,7 @@ LOCAL_SRC_FILES := \
magiskboot/dtb.c \
magiskboot/dtb.c \
utils/xwrap.c \
utils/xwrap.c \
utils/vector.c
utils/vector.c
LOCAL_
CFLAGS := -DZLIB_CONST
LOCAL_
LDLIBS := -lz
include $(BUILD_EXECUTABLE)
include $(BUILD_EXECUTABLE)
# magiskinit
# magiskinit
...
...
jni/external/Android.mk
View file @
6c229ffa
LOCAL_PATH:= $(call my-dir)
LOCAL_PATH:= $(call my-dir)
EXTERNAL := $(LOCAL_PATH)
# libsqlite.so (stub)
# libsqlite.so (stub)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
...
@@ -14,7 +13,7 @@ LOCAL_C_INCLUDES := $(LIBSELINUX)
...
@@ -14,7 +13,7 @@ LOCAL_C_INCLUDES := $(LIBSELINUX)
LOCAL_SRC_FILES := stubs/selinux_stub.c
LOCAL_SRC_FILES := stubs/selinux_stub.c
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_SHARED_LIBRARY)
# libfdt
# libfdt
.a
include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_MODULE:= libfdt
LOCAL_MODULE:= libfdt
LOCAL_C_INCLUDES := $(LIBFDT)
LOCAL_C_INCLUDES := $(LIBFDT)
...
@@ -30,11 +29,129 @@ LOCAL_SRC_FILES := \
...
@@ -30,11 +29,129 @@ LOCAL_SRC_FILES := \
dtc/libfdt/fdt_wip.c
dtc/libfdt/fdt_wip.c
include $(BUILD_STATIC_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
# libsepol, static library
# liblz4.a
include $(SELINUX_PATH)/libsepol/Android.mk
include $(CLEAR_VARS)
LOCAL_MODULE := liblz4
LOCAL_C_INCLUDES += $(LIBLZ4)
LOCAL_SRC_FILES := \
lz4/lib/lz4.c \
lz4/lib/lz4frame.c \
lz4/lib/lz4hc.c \
lz4/lib/xxhash.c
include $(BUILD_STATIC_LIBRARY)
# libbz2.a
include $(CLEAR_VARS)
LOCAL_MODULE := libbz2
LOCAL_C_INCLUDES += $(LIBBZ2)
LOCAL_SRC_FILES := \
bzip2/blocksort.c \
bzip2/huffman.c \
bzip2/crctable.c \
bzip2/randtable.c \
bzip2/compress.c \
bzip2/decompress.c \
bzip2/bzlib.c
include $(BUILD_STATIC_LIBRARY)
# liblzma.a
include $(CLEAR_VARS)
LOCAL_MODULE := liblzma
LOCAL_C_INCLUDES += \
$(EXT_PATH)/xz_config \
$(EXT_PATH)/xz/src/common \
$(EXT_PATH)/xz/src/liblzma/api \
$(EXT_PATH)/xz/src/liblzma/check \
$(EXT_PATH)/xz/src/liblzma/common \
$(EXT_PATH)/xz/src/liblzma/delta \
$(EXT_PATH)/xz/src/liblzma/lz \
$(EXT_PATH)/xz/src/liblzma/lzma \
$(EXT_PATH)/xz/src/liblzma/rangecoder \
$(EXT_PATH)/xz/src/liblzma/simple \
$(EXT_PATH)/xz/src/liblzma
LOCAL_SRC_FILES := \
xz/src/common/tuklib_cpucores.c \
xz/src/common/tuklib_exit.c \
xz/src/common/tuklib_mbstr_fw.c \
xz/src/common/tuklib_mbstr_width.c \
xz/src/common/tuklib_open_stdxxx.c \
xz/src/common/tuklib_physmem.c \
xz/src/common/tuklib_progname.c \
xz/src/liblzma/check/check.c \
xz/src/liblzma/check/crc32_fast.c \
xz/src/liblzma/check/crc32_table.c \
xz/src/liblzma/check/crc64_fast.c \
xz/src/liblzma/check/crc64_table.c \
xz/src/liblzma/check/sha256.c \
xz/src/liblzma/common/alone_decoder.c \
xz/src/liblzma/common/alone_encoder.c \
xz/src/liblzma/common/auto_decoder.c \
xz/src/liblzma/common/block_buffer_decoder.c \
xz/src/liblzma/common/block_buffer_encoder.c \
xz/src/liblzma/common/block_decoder.c \
xz/src/liblzma/common/block_encoder.c \
xz/src/liblzma/common/block_header_decoder.c \
xz/src/liblzma/common/block_header_encoder.c \
xz/src/liblzma/common/block_util.c \
xz/src/liblzma/common/common.c \
xz/src/liblzma/common/easy_buffer_encoder.c \
xz/src/liblzma/common/easy_decoder_memusage.c \
xz/src/liblzma/common/easy_encoder.c \
xz/src/liblzma/common/easy_encoder_memusage.c \
xz/src/liblzma/common/easy_preset.c \
xz/src/liblzma/common/filter_buffer_decoder.c \
xz/src/liblzma/common/filter_buffer_encoder.c \
xz/src/liblzma/common/filter_common.c \
xz/src/liblzma/common/filter_decoder.c \
xz/src/liblzma/common/filter_encoder.c \
xz/src/liblzma/common/filter_flags_decoder.c \
xz/src/liblzma/common/filter_flags_encoder.c \
xz/src/liblzma/common/hardware_cputhreads.c \
xz/src/liblzma/common/hardware_physmem.c \
xz/src/liblzma/common/index.c \
xz/src/liblzma/common/index_decoder.c \
xz/src/liblzma/common/index_encoder.c \
xz/src/liblzma/common/index_hash.c \
xz/src/liblzma/common/outqueue.c \
xz/src/liblzma/common/stream_buffer_decoder.c \
xz/src/liblzma/common/stream_buffer_encoder.c \
xz/src/liblzma/common/stream_decoder.c \
xz/src/liblzma/common/stream_encoder.c \
xz/src/liblzma/common/stream_encoder_mt.c \
xz/src/liblzma/common/stream_flags_common.c \
xz/src/liblzma/common/stream_flags_decoder.c \
xz/src/liblzma/common/stream_flags_encoder.c \
xz/src/liblzma/common/vli_decoder.c \
xz/src/liblzma/common/vli_encoder.c \
xz/src/liblzma/common/vli_size.c \
xz/src/liblzma/delta/delta_common.c \
xz/src/liblzma/delta/delta_decoder.c \
xz/src/liblzma/delta/delta_encoder.c \
xz/src/liblzma/lz/lz_decoder.c \
xz/src/liblzma/lz/lz_encoder.c \
xz/src/liblzma/lz/lz_encoder_mf.c \
xz/src/liblzma/lzma/fastpos_table.c \
xz/src/liblzma/lzma/fastpos_tablegen.c \
xz/src/liblzma/lzma/lzma2_decoder.c \
xz/src/liblzma/lzma/lzma2_encoder.c \
xz/src/liblzma/lzma/lzma_decoder.c \
xz/src/liblzma/lzma/lzma_encoder.c \
xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c \
xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c \
xz/src/liblzma/lzma/lzma_encoder_presets.c \
xz/src/liblzma/rangecoder/price_table.c \
xz/src/liblzma/rangecoder/price_tablegen.c \
xz/src/liblzma/simple/arm.c \
xz/src/liblzma/simple/armthumb.c \
xz/src/liblzma/simple/ia64.c \
xz/src/liblzma/simple/powerpc.c \
xz/src/liblzma/simple/simple_coder.c \
xz/src/liblzma/simple/simple_decoder.c \
xz/src/liblzma/simple/simple_encoder.c \
xz/src/liblzma/simple/sparc.c \
xz/src/liblzma/simple/x86.c
LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=c99
include $(BUILD_STATIC_LIBRARY)
# Compression libraries for magiskboot
# libsepol.a
include $(COMPRESS_LIB)/zlib/Android.mk
include $(SE_PATH)/libsepol/Android.mk
include $(COMPRESS_LIB)/xz/src/liblzma/Android.mk
include $(COMPRESS_LIB)/lz4/lib/Android.mk
include $(COMPRESS_LIB)/bzip2/Android.mk
bzip2
@
67d81858
Subproject commit 67d818584d505503c2bdbd15aec43e6219642762
dtc
@
22a65c53
Subproject commit
fe50bd1ecc1da273a7627a76dcd38da9d77e496f
Subproject commit
22a65c5331c22979d416738eb756b9541672e00d
lz4
@
c10863b9
Subproject commit c10863b98e1503af90616ae99725ecd120265dfb
ndk-compression
@
b5cefe45
Subproject commit b5cefe452bff3c07d3e768f2e2bdcf01eb146ef5
xz
@
3d566cd5
Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c
jni/external/xz_config/config.h
0 → 100644
View file @
6c229ffa
This diff is collapsed.
Click to expand it.
jni/magiskboot/compress.c
View file @
6c229ffa
...
@@ -44,7 +44,7 @@ size_t gzip(int mode, int fd, const void *buf, size_t size) {
...
@@ -44,7 +44,7 @@ size_t gzip(int mode, int fd, const void *buf, size_t size) {
LOGE
(
"Unable to init zlib stream
\n
"
);
LOGE
(
"Unable to init zlib stream
\n
"
);
do
{
do
{
strm
.
next_in
=
buf
+
pos
;
strm
.
next_in
=
(
void
*
)
buf
+
pos
;
if
(
pos
+
CHUNK
>=
size
)
{
if
(
pos
+
CHUNK
>=
size
)
{
strm
.
avail_in
=
size
-
pos
;
strm
.
avail_in
=
size
-
pos
;
flush
=
Z_FINISH
;
flush
=
Z_FINISH
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment