Skip to content

Commit c29c8d3

Browse files
Miccia94Drgravy
authored andcommitted
vendor: Switch to Magisk as the built in root [1/2]
Adapted for aicp Credits to topjohnwu for Magisk. Change-Id: I4bfd62ba120055215f187c4e9690f16b98c0e472
1 parent 284bd7e commit c29c8d3

File tree

7 files changed

+20
-9
lines changed

7 files changed

+20
-9
lines changed

configs/common.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,9 @@ ifneq ($(TARGET_DISABLE_CMSDK), true)
119119
include vendor/aicp/configs/cmsdk_common.mk
120120
endif
121121

122-
# SuperSU
123-
#PRODUCT_COPY_FILES += \
124-
# vendor/aicp/prebuilt/common/UPDATE-SuperSU.zip:system/addon.d/UPDATE-SuperSU.zip \
125-
# vendor/aicp/prebuilt/common/etc/init.d/99SuperSUDaemon:system/etc/init.d/99SuperSUDaemon
122+
# Copy Magisk zip
123+
PRODUCT_COPY_FILES += \
124+
vendor/aicp/prebuilt/common/magisk.zip:system/addon.d/magisk.zip
126125

127126
# Copy latinime for gesture typing
128127
#PRODUCT_COPY_FILES += \

configs/common_mini_tablet_wifionly.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,9 @@ ifneq ($(TARGET_DISABLE_CMSDK), true)
9898
include vendor/aicp/configs/cmsdk_common.mk
9999
endif
100100

101-
# SuperSU
102-
#PRODUCT_COPY_FILES += \
103-
# vendor/aicp/prebuilt/common/UPDATE-SuperSU.zip:system/addon.d/UPDATE-SuperSU.zip \
104-
# vendor/aicp/prebuilt/common/etc/init.d/99SuperSUDaemon:system/etc/init.d/99SuperSUDaemon
101+
# Copy Magisk zip
102+
PRODUCT_COPY_FILES += \
103+
vendor/aicp/prebuilt/common/magisk.zip:system/addon.d/magisk.zip
105104

106105
# Copy latinime for gesture typing
107106
#PRODUCT_COPY_FILES += \

configs/common_packages.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ PRODUCT_PACKAGES += \
4747
PhotoPhase \
4848
procmem \
4949
procrank \
50-
Superuser \
5150
Torch \
5251
VisualizationWallpapers
5352

@@ -149,3 +148,7 @@ PRODUCT_PACKAGES += \
149148
# OMS Verified
150149
PRODUCT_PROPERTY_OVERRIDES := \
151150
ro.substratum.verified=true
151+
152+
# Magisk Manager
153+
PRODUCT_PACKAGES += \
154+
MagiskManager

prebuilt/Android.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,13 @@ include $(BUILD_PREBUILT)
6464
#LOCAL_MODULE_SUFFIX := .jar
6565
#LOCAL_MODULE_CLASS := JAVA_LIBRARIES
6666
#include $(BUILD_PREBUILT)
67+
68+
include $(CLEAR_VARS)
69+
LOCAL_MODULE := MagiskManager
70+
LOCAL_MODULE_OWNER := aicp
71+
LOCAL_SRC_FILES := common/app/$(LOCAL_MODULE).apk
72+
LOCAL_MODULE_TAGS := optional
73+
LOCAL_MODULE_SUFFIX := .apk
74+
LOCAL_MODULE_CLASS := APPS
75+
LOCAL_CERTIFICATE := PRESIGNED
76+
include $(BUILD_PREBUILT)

prebuilt/common/UPDATE-SuperSU.zip

-3.83 MB
Binary file not shown.
3.54 MB
Binary file not shown.

prebuilt/common/magisk.zip

5.72 MB
Binary file not shown.

0 commit comments

Comments
 (0)