Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c75cad authored by Matt Mower's avatar Matt Mower Committed by Ethan Yonker
Browse files

Build block TWRP with RECOVERY_VARIANT 

Enable TWRP to reside alongside other recoveries with the naming
convention: bootable/recovery(-flag). If TWRP resides at
bootable/recovery and a device does not specify RECOVERY_VARIANT, then
it will build like normal. If TWRP resides at bootable/recovery-twrp,
then its makefiles will only be parsed if a device specifies
'RECOVERY_VARIANT := twrp'. This prevents TWRP specific makefile
warnings/errors (notably, missing DEVICE_RESOLUTION) when another
recovery is being built.

Change-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e
parent 298c4387

Android.mk

+14 −2
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 


LOCAL_PATH := $(call my-dir)



ifeq ($(RECOVERY_VARIANT),)

ifeq ($(LOCAL_PATH),bootable/recovery)

RECOVERY_VARIANT := twrp

endif

endif



ifeq ($(RECOVERY_VARIANT),twrp)



include $(CLEAR_VARS)



TARGET_RECOVERY_GUI := true
@@ -321,7 +329,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := verifier_test

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_TAGS := tests

LOCAL_C_INCLUDES := bootable/recovery/libmincrypt/includes

LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes

LOCAL_SRC_FILES := \

    verifier_test.cpp \

    verifier.cpp \
@@ -339,7 +347,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := libaosprecovery

LOCAL_MODULE_TAGS := eng

LOCAL_MODULES_TAGS = optional

LOCAL_C_INCLUDES := bootable/recovery/libmincrypt/includes

LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes

LOCAL_SRC_FILES = adb_install.cpp bootloader.cpp verifier.cpp mtdutils/mtdutils.c legacy_property_service.c

LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils

LOCAL_STATIC_LIBRARIES += libmincrypttwrp
@@ -418,3 +426,7 @@ endif 
ifeq ($(TW_INCLUDE_FB2PNG), true)

    include $(commands_recovery_local_path)/fb2png/Android.mk

endif



commands_recovery_local_path :=



endif

applypatch/Android.mk

+6 −3
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := applypatch.c bspatch.c freecache.c imgpatch.c utils.c

LOCAL_MODULE := libapplypatch

LOCAL_MODULE_TAGS := eng

LOCAL_C_INCLUDES += external/bzip2 external/zlib bootable/recovery

LOCAL_C_INCLUDES += \

    external/bzip2 \

    external/zlib \

    $(commands_recovery_local_path)

LOCAL_STATIC_LIBRARIES += libmtdutils libmincrypttwrp libbz libz



include $(BUILD_STATIC_LIBRARY)
@@ -27,7 +30,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := main.c

LOCAL_MODULE := applypatch

LOCAL_C_INCLUDES += bootable/recovery

LOCAL_C_INCLUDES += $(commands_recovery_local_path)

LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf

LOCAL_SHARED_LIBRARIES += libz libcutils libstdc++ libc
@@ -39,7 +42,7 @@ LOCAL_SRC_FILES := main.c 
LOCAL_MODULE := applypatch_static

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_TAGS := eng

LOCAL_C_INCLUDES += bootable/recovery

LOCAL_C_INCLUDES += $(commands_recovery_local_path)

LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf

LOCAL_STATIC_LIBRARIES += libz libcutils libstdc++ libc

bmlutils/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ 
  )



LOCAL_STATIC_LIBRARIES := libcrecovery

LOCAL_C_INCLUDES := bootable/recovery/libcrecovery

LOCAL_C_INCLUDES := $(commands_recovery_local_path)/libcrecovery



LOCAL_SRC_FILES := bmlutils.c

LOCAL_MODULE := libbmlutils

crypto/crypttools/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp libc libcutils 
LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES

LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_C_INCLUDES := bootable/recovery/crypto/jb/

LOCAL_C_INCLUDES := $(commands_recovery_local_path)/crypto/jb/

include $(BUILD_EXECUTABLE)

endif
 
 No newline at end of file

crypto/fs_mgr/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 
LOCAL_MODULE:= libfs_mgrtwrp

LOCAL_SHARED_LIBRARIES := libext4_utils

LOCAL_STATIC_LIBRARIES := liblogwraptwrp libmincrypttwrp

LOCAL_C_INCLUDES += system/extras/ext4_utils bootable/recovery/libmincrypt/includes

LOCAL_C_INCLUDES += \

    system/extras/ext4_utils \

    $(commands_recovery_local_path)/libmincrypt/includes

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



include $(BUILD_STATIC_LIBRARY)