Merge "Create a flag to include resetprop in the TWRP" into android-9.0

ant9000 · May 10, 2020 · aaa9e64 · aaa9e64
2 parents f6e42ce + 76ef9f3
commit aaa9e64
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
@@ -577,9 +577,9 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     endif
 endif
 
-ifeq ($(TW_INCLUDE_REPACKTOOLS), true)
+ifneq (,$(filter $(TW_INCLUDE_REPACKTOOLS) $(TW_INCLUDE_RESETPROP), true))
     ifeq ($(wildcard external/magisk-prebuilt/Android.mk),)
-        $(warning Magisk repacking tools not found!)
+        $(warning Magisk prebuilt tools not found!)
         $(warning Please place https://github.com/TeamWin/external_magisk-prebuilt)
         $(warning into external/magisk-prebuilt)
         $(error magiskboot prebuilts not present; exiting)