Goodbye, Magisk

This reverts commit c29c8d3. there is no built-in root. you can choose it Signed-off-by: lindwurm <admin@lindwurm.biz> Signed-off-by: lindwurm <lindwurm.q@gmail.com>
mordiford · Feb 13, 2017 · 280cf5f13f4bc459cb9bcd2d95978f487949bca8 · 280cf5f
1 parent 3a86810
commit 280cf5f13f4bc459cb9bcd2d95978f487949bca8
Unified Split

Showing with 0 additions and 23 deletions.

+0 −4 configs/common.mk

+0 −4 configs/common_mini_tablet_wifionly.mk

+0 −5 configs/common_packages.mk

+0 −10 prebuilt/Android.mk

BIN prebuilt/common/app/MagiskManager.apk

BIN prebuilt/common/magisk.zip
diff --git a/configs/common.mk b/configs/common.mk
@@ -119,10 +119,6 @@ ifneq ($(TARGET_DISABLE_CMSDK), true)
 include vendor/aicp/configs/cmsdk_common.mk
 endif

-# Copy Magisk zip
-PRODUCT_COPY_FILES += \
-    vendor/aicp/prebuilt/common/magisk.zip:system/addon.d/magisk.zip
-
 # Copy latinime for gesture typing
 #PRODUCT_COPY_FILES += \
 #    vendor/aicp/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
diff --git a/configs/common_mini_tablet_wifionly.mk b/configs/common_mini_tablet_wifionly.mk
@@ -98,10 +98,6 @@ ifneq ($(TARGET_DISABLE_CMSDK), true)
 include vendor/aicp/configs/cmsdk_common.mk
 endif

-# Copy Magisk zip
-PRODUCT_COPY_FILES += \
-    vendor/aicp/prebuilt/common/magisk.zip:system/addon.d/magisk.zip
-
 # Copy latinime for gesture typing
 #PRODUCT_COPY_FILES += \
 #    vendor/aicp/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
diff --git a/configs/common_packages.mk b/configs/common_packages.mk
@@ -149,11 +149,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES := \
    ro.substratum.verified=true

-# Magisk Manager
-PRODUCT_PACKAGES += \
-    MagiskManager
-
 #OmniJaws 
 PRODUCT_PACKAGES += \
    OmniJaws
-
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
@@ -64,13 +64,3 @@ include $(BUILD_PREBUILT)
 #LOCAL_MODULE_SUFFIX := .jar
 #LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 #include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := MagiskManager
-LOCAL_MODULE_OWNER := aicp
-LOCAL_SRC_FILES := common/app/$(LOCAL_MODULE).apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/app/MagiskManager.apk b/prebuilt/common/app/MagiskManager.apk
diff --git a/prebuilt/common/magisk.zip b/prebuilt/common/magisk.zip