Skip to content

Commit

Permalink
Switch between dependencies and modules
Browse files Browse the repository at this point in the history 
Use LOCAL_REQUIRED_MODULES for Pie and up and
LOCAL_ADDITIONAL_DEPENDENCIES for Oreo and down.

Change-Id: I5365e782f98f3bbf4bf246be22c8f573824b65ee
  • Loading branch information
@Dees-Troy
Dees-Troy committed May 24, 2019
1 parent f5955b1 commit abf1fb0
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 37 deletions.
75 changes: 45 additions & 30 deletions Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ LOCAL_SHARED_LIBRARIES += libselinux
ifeq ($(AB_OTA_UPDATER),true)
LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
LOCAL_SHARED_LIBRARIES += libhardware [email protected]
LOCAL_REQUIRED_MODULES += libhardware
TWRP_REQUIRED_MODULES += libhardware
endif

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
Expand Down Expand Up @@ -398,7 +398,7 @@ endif
ifneq ($(TW_CLOCK_OFFSET),)
LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET)
endif
LOCAL_REQUIRED_MODULES += \
TWRP_REQUIRED_MODULES += \
dump_image \
erase_image \
flash_image \
Expand Down Expand Up @@ -433,96 +433,102 @@ ifneq ($(TW_USE_TOOLBOX), true)
endif
else
ifneq ($(wildcard external/toybox/Android.mk),)
LOCAL_REQUIRED_MODULES += toybox_symlinks

This comment has been minimized.

Sign in to view

Copy link
@clsather

clsather Jun 28, 2020

toybox/Android.mk thats all i ever got about a toolbox.
or toybox
TWRP_REQUIRED_MODULES += toybox_symlinks
endif
ifneq ($(wildcard external/zip/Android.mk),)
LOCAL_REQUIRED_MODULES += zip
TWRP_REQUIRED_MODULES += zip
endif
ifneq ($(wildcard external/unzip/Android.mk),)
LOCAL_REQUIRED_MODULES += unzip
TWRP_REQUIRED_MODULES += unzip
endif
endif

ifneq ($(TW_NO_EXFAT), true)
LOCAL_REQUIRED_MODULES += mkexfatfs fsckexfat
TWRP_REQUIRED_MODULES += mkexfatfs fsckexfat
ifneq ($(TW_NO_EXFAT_FUSE), true)
LOCAL_REQUIRED_MODULES += exfat-fuse
TWRP_REQUIRED_MODULES += exfat-fuse
endif
endif
ifeq ($(BOARD_HAS_NO_REAL_SDCARD),)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
LOCAL_REQUIRED_MODULES += sgdisk
TWRP_REQUIRED_MODULES += sgdisk
else
LOCAL_REQUIRED_MODULES += sgdisk_static
TWRP_REQUIRED_MODULES += sgdisk_static
endif
endif
ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
LOCAL_REQUIRED_MODULES += openaes openaes_license
TWRP_REQUIRED_MODULES += openaes openaes_license
endif
ifeq ($(TW_INCLUDE_DUMLOCK), true)
LOCAL_REQUIRED_MODULES += \
TWRP_REQUIRED_MODULES += \
htcdumlock htcdumlocksys flash_imagesys dump_imagesys libbmlutils.so \
libflashutils.so libmmcutils.so libmtdutils.so HTCDumlock.apk
endif
ifeq ($(TW_INCLUDE_FB2PNG), true)
LOCAL_REQUIRED_MODULES += fb2png
TWRP_REQUIRED_MODULES += fb2png
endif
ifneq ($(TW_OEM_BUILD),true)
LOCAL_REQUIRED_MODULES += orscmd
TWRP_REQUIRED_MODULES += orscmd
endif
ifeq ($(BOARD_USES_BML_OVER_MTD),true)
LOCAL_REQUIRED_MODULES += bml_over_mtd
TWRP_REQUIRED_MODULES += bml_over_mtd
endif
ifeq ($(TW_INCLUDE_INJECTTWRP), true)
LOCAL_REQUIRED_MODULES += injecttwrp
TWRP_REQUIRED_MODULES += injecttwrp
endif
ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true)
LOCAL_REQUIRED_MODULES += init.recovery.usb.rc
TWRP_REQUIRED_MODULES += init.recovery.usb.rc
endif
ifeq ($(TWRP_INCLUDE_LOGCAT), true)
LOCAL_REQUIRED_MODULES += logcat
TWRP_REQUIRED_MODULES += logcat
ifeq ($(TARGET_USES_LOGD), true)
LOCAL_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
TWRP_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
endif
endif
# Allow devices to specify device-specific recovery dependencies
ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
LOCAL_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
endif
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"
ifeq ($(TW_INCLUDE_NTFS_3G),true)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
LOCAL_REQUIRED_MODULES += \
TWRP_REQUIRED_MODULES += \
mount.ntfs \
fsck.ntfs \
mkfs.ntfs
else
LOCAL_REQUIRED_MODULES += \
TWRP_REQUIRED_MODULES += \
ntfs-3g \
ntfsfix \
mkntfs
endif
endif
ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 3; echo $$?),0)
LOCAL_REQUIRED_MODULES += \
TWRP_REQUIRED_MODULES += \
fsck.f2fs \
mkfs.f2fs
endif
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES += sload.f2fs
TWRP_REQUIRED_MODULES += sload.f2fs
endif
endif

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
LOCAL_REQUIRED_MODULES += file_contexts_text
else ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0)
LOCAL_ADDITIONAL_DEPENDENCIES += file_contexts_text
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0)
TWRP_REQUIRED_MODULES += file_contexts_text
endif

ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
TWRP_REQUIRED_MODULES += recovery-persist recovery-refresh
endif
endif

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES += $(TWRP_REQUIRED_MODULES)
else
LOCAL_ADDITIONAL_DEPENDENCIES += $(TWRP_REQUIRED_MODULES)
endif

include $(BUILD_EXECUTABLE)
Expand All @@ -532,7 +538,11 @@ include $(CLEAR_VARS)

LOCAL_MODULE := file_contexts_text
LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := file_contexts.bin
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := file_contexts.bin
else
LOCAL_ADDITIONAL_DEPENDENCIES := file_contexts.bin
endif
LOCAL_POST_INSTALL_CMD := \
$(hide) cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts

Expand Down Expand Up @@ -573,6 +583,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE := busybox_symlinks
LOCAL_MODULE_TAGS := optional
LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(RECOVERY_BUSYBOX_SYMLINKS)
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
endif
ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS)
endif
Expand Down
6 changes: 5 additions & 1 deletion crypto/ext4crypt/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
LOCAL_SHARED_LIBRARIES += libkeyutils
endif
endif
LOCAL_REQUIRED_MODULES := keystore_auth
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := keystore_auth
else
LOCAL_ADDITIONAL_DEPENDENCIES := keystore_auth
endif
else
#7.x rules
LOCAL_SRC_FILES += Ext4Crypt.cpp Keymaster.cpp KeyStorage.cpp
Expand Down
12 changes: 10 additions & 2 deletions crypto/scrypt/Scrypt.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ LOCAL_CFLAGS += $(target_c_flags)
LOCAL_C_INCLUDES += $(target_c_includes) $(commands_recovery_local_path)/crypto/scrypt/lib/util
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libscrypttwrp_static
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(local_additional_dependencies)
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
endif
include $(BUILD_STATIC_LIBRARY)

########################################
Expand All @@ -42,5 +46,9 @@ LOCAL_C_INCLUDES += $(host_c_includes) $(commands_recovery_local_path)/crypto/sc
LOCAL_LDLIBS += -ldl
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libscrypttwrp_static
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(local_additional_dependencies)
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
endif
include $(BUILD_HOST_STATIC_LIBRARY)
6 changes: 5 additions & 1 deletion minui/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
LOCAL_CFLAGS += -DMSM_BSP
LOCAL_SRC_FILES += graphics_overlay.cpp
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
else
ifeq ($(TARGET_CUSTOM_KERNEL_HEADERS),)
Expand Down
6 changes: 5 additions & 1 deletion minuitwrp/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
LOCAL_CFLAGS += -DMSM_BSP
LOCAL_SRC_FILES += graphics_overlay.cpp
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
else
ifeq ($(TARGET_CUSTOM_KERNEL_HEADERS),)
Expand Down
6 changes: 5 additions & 1 deletion toolbox/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,11 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
include $(CLEAR_VARS)
LOCAL_MODULE := toolbox_symlinks
LOCAL_MODULE_TAGS := optional
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(SYMLINKS)
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
endif
include $(BUILD_PHONY_PACKAGE)

ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
Expand Down
6 changes: 5 additions & 1 deletion toybox/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,11 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
include $(CLEAR_VARS)
LOCAL_MODULE := toybox_symlinks
LOCAL_MODULE_TAGS := optional
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
LOCAL_REQUIRED_MODULES := $(SYMLINKS)
else
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
endif
include $(BUILD_PHONY_PACKAGE)

endif
Expand Down

0 comments on commit abf1fb0

Please sign in to comment.