TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-16 00:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let Magisk compile against SDK 16

Browse Source
This commit is contained in:
topjohnwu
2018-07-13 22:14:32 +08:00
parent 1affb91f17
commit f339a087a2
19 changed files with 710 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/magiskboot/bootimg.h
View File

@@ -99,9 +99,9 @@ typedef struct mtk_hdr {
} __attribute__((packed)) mtk_hdr;
typedef struct dhtb_hdr {
char magic[8]; /* DHTB magic */
char checksum[40]; /* Payload SHA256, whole image + SEANDROIDENFORCE + 0xFFFFFFFF */
uint32_t size; /* Payload size, whole image + SEANDROIDENFORCE + 0xFFFFFFFF */
char magic[8]; /* DHTB magic */
uint8_t checksum[40]; /* Payload SHA256, whole image + SEANDROIDENFORCE + 0xFFFFFFFF */
uint32_t size; /* Payload size, whole image + SEANDROIDENFORCE + 0xFFFFFFFF */
} __attribute__((packed)) dhtb_hdr;
typedef struct blob_hdr {

2
native/jni/magiskboot/dtb.c
View File

@@ -78,7 +78,7 @@ static void dtb_patch(const char *file, int patch) {
fdt_for_each_subnode(block, fdt, fstab) {
fprintf(stderr, "Found block [%s] in fstab\n", fdt_get_name(fdt, block, NULL));
uint32_t value_size;
void *value = (void *) fdt_getprop(fdt, block, "fsmgr_flags", &value_size);
void *value = (void *) fdt_getprop(fdt, block, "fsmgr_flags", (int *)&value_size);
if (patch) {
void *dup = xmalloc(value_size);
memcpy(dup, value, value_size);