Skip to content

Commit abf1fb0

Browse files
Dees-TroyDees-Troy
committed
Switch between dependencies and modules
Use LOCAL_REQUIRED_MODULES for Pie and up and LOCAL_ADDITIONAL_DEPENDENCIES for Oreo and down. Change-Id: I5365e782f98f3bbf4bf246be22c8f573824b65ee
1 parent f5955b1 commit abf1fb0

File tree

7 files changed

+80
-37
lines changed

7 files changed

+80
-37
lines changed

‎Android.mk

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ LOCAL_SHARED_LIBRARIES += libselinux
190190
ifeq ($(AB_OTA_UPDATER),true)
191191
LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
192192
LOCAL_SHARED_LIBRARIES += libhardware [email protected]
193-
LOCAL_REQUIRED_MODULES += libhardware
193+
TWRP_REQUIRED_MODULES += libhardware
194194
endif
195195

196196
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
@@ -398,7 +398,7 @@ endif
398398
ifneq ($(TW_CLOCK_OFFSET),)
399399
LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET)
400400
endif
401-
LOCAL_REQUIRED_MODULES += \
401+
TWRP_REQUIRED_MODULES += \
402402
dump_image \
403403
erase_image \
404404
flash_image \
@@ -433,96 +433,102 @@ ifneq ($(TW_USE_TOOLBOX), true)
433433
endif
434434
else
435435
ifneq ($(wildcard external/toybox/Android.mk),)
436-
LOCAL_REQUIRED_MODULES += toybox_symlinks
436+
TWRP_REQUIRED_MODULES += toybox_symlinks
437437
endif
438438
ifneq ($(wildcard external/zip/Android.mk),)
439-
LOCAL_REQUIRED_MODULES += zip
439+
TWRP_REQUIRED_MODULES += zip
440440
endif
441441
ifneq ($(wildcard external/unzip/Android.mk),)
442-
LOCAL_REQUIRED_MODULES += unzip
442+
TWRP_REQUIRED_MODULES += unzip
443443
endif
444444
endif
445445

446446
ifneq ($(TW_NO_EXFAT), true)
447-
LOCAL_REQUIRED_MODULES += mkexfatfs fsckexfat
447+
TWRP_REQUIRED_MODULES += mkexfatfs fsckexfat
448448
ifneq ($(TW_NO_EXFAT_FUSE), true)
449-
LOCAL_REQUIRED_MODULES += exfat-fuse
449+
TWRP_REQUIRED_MODULES += exfat-fuse
450450
endif
451451
endif
452452
ifeq ($(BOARD_HAS_NO_REAL_SDCARD),)
453453
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
454-
LOCAL_REQUIRED_MODULES += sgdisk
454+
TWRP_REQUIRED_MODULES += sgdisk
455455
else
456-
LOCAL_REQUIRED_MODULES += sgdisk_static
456+
TWRP_REQUIRED_MODULES += sgdisk_static
457457
endif
458458
endif
459459
ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
460-
LOCAL_REQUIRED_MODULES += openaes openaes_license
460+
TWRP_REQUIRED_MODULES += openaes openaes_license
461461
endif
462462
ifeq ($(TW_INCLUDE_DUMLOCK), true)
463-
LOCAL_REQUIRED_MODULES += \
463+
TWRP_REQUIRED_MODULES += \
464464
htcdumlock htcdumlocksys flash_imagesys dump_imagesys libbmlutils.so \
465465
libflashutils.so libmmcutils.so libmtdutils.so HTCDumlock.apk
466466
endif
467467
ifeq ($(TW_INCLUDE_FB2PNG), true)
468-
LOCAL_REQUIRED_MODULES += fb2png
468+
TWRP_REQUIRED_MODULES += fb2png
469469
endif
470470
ifneq ($(TW_OEM_BUILD),true)
471-
LOCAL_REQUIRED_MODULES += orscmd
471+
TWRP_REQUIRED_MODULES += orscmd
472472
endif
473473
ifeq ($(BOARD_USES_BML_OVER_MTD),true)
474-
LOCAL_REQUIRED_MODULES += bml_over_mtd
474+
TWRP_REQUIRED_MODULES += bml_over_mtd
475475
endif
476476
ifeq ($(TW_INCLUDE_INJECTTWRP), true)
477-
LOCAL_REQUIRED_MODULES += injecttwrp
477+
TWRP_REQUIRED_MODULES += injecttwrp
478478
endif
479479
ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true)
480-
LOCAL_REQUIRED_MODULES += init.recovery.usb.rc
480+
TWRP_REQUIRED_MODULES += init.recovery.usb.rc
481481
endif
482482
ifeq ($(TWRP_INCLUDE_LOGCAT), true)
483-
LOCAL_REQUIRED_MODULES += logcat
483+
TWRP_REQUIRED_MODULES += logcat
484484
ifeq ($(TARGET_USES_LOGD), true)
485-
LOCAL_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
485+
TWRP_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
486486
endif
487487
endif
488488
# Allow devices to specify device-specific recovery dependencies
489489
ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
490-
LOCAL_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
490+
TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
491491
endif
492492
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
493493
LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"
494494
ifeq ($(TW_INCLUDE_NTFS_3G),true)
495495
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
496-
LOCAL_REQUIRED_MODULES += \
496+
TWRP_REQUIRED_MODULES += \
497497
mount.ntfs \
498498
fsck.ntfs \
499499
mkfs.ntfs
500500
else
501-
LOCAL_REQUIRED_MODULES += \
501+
TWRP_REQUIRED_MODULES += \
502502
ntfs-3g \
503503
ntfsfix \
504504
mkntfs
505505
endif
506506
endif
507507
ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
508508
ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 3; echo $$?),0)
509-
LOCAL_REQUIRED_MODULES += \
509+
TWRP_REQUIRED_MODULES += \
510510
fsck.f2fs \
511511
mkfs.f2fs
512512
endif
513513
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
514-
LOCAL_REQUIRED_MODULES += sload.f2fs
514+
TWRP_REQUIRED_MODULES += sload.f2fs
515515
endif
516516
endif
517517

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

524-
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
525-
LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh
522+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
523+
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
524+
TWRP_REQUIRED_MODULES += recovery-persist recovery-refresh
525+
endif
526+
endif
527+
528+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
529+
LOCAL_REQUIRED_MODULES += $(TWRP_REQUIRED_MODULES)
530+
else
531+
LOCAL_ADDITIONAL_DEPENDENCIES += $(TWRP_REQUIRED_MODULES)
526532
endif
527533

528534
include $(BUILD_EXECUTABLE)
@@ -532,7 +538,11 @@ include $(CLEAR_VARS)
532538

533539
LOCAL_MODULE := file_contexts_text
534540
LOCAL_MODULE_TAGS := optional
535-
LOCAL_REQUIRED_MODULES := file_contexts.bin
541+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
542+
LOCAL_REQUIRED_MODULES := file_contexts.bin
543+
else
544+
LOCAL_ADDITIONAL_DEPENDENCIES := file_contexts.bin
545+
endif
536546
LOCAL_POST_INSTALL_CMD := \
537547
$(hide) cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts
538548

@@ -573,6 +583,11 @@ include $(CLEAR_VARS)
573583
LOCAL_MODULE := busybox_symlinks
574584
LOCAL_MODULE_TAGS := optional
575585
LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
586+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
587+
LOCAL_REQUIRED_MODULES := $(RECOVERY_BUSYBOX_SYMLINKS)
588+
else
589+
LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
590+
endif
576591
ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
577592
ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS)
578593
endif

‎crypto/ext4crypt/Android.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
4545
LOCAL_SHARED_LIBRARIES += libkeyutils
4646
endif
4747
endif
48-
LOCAL_REQUIRED_MODULES := keystore_auth
48+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
49+
LOCAL_REQUIRED_MODULES := keystore_auth
50+
else
51+
LOCAL_ADDITIONAL_DEPENDENCIES := keystore_auth
52+
endif
4953
else
5054
#7.x rules
5155
LOCAL_SRC_FILES += Ext4Crypt.cpp Keymaster.cpp KeyStorage.cpp

‎crypto/scrypt/Scrypt.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ LOCAL_CFLAGS += $(target_c_flags)
2727
LOCAL_C_INCLUDES += $(target_c_includes) $(commands_recovery_local_path)/crypto/scrypt/lib/util
2828
LOCAL_MODULE_TAGS := optional
2929
LOCAL_MODULE:= libscrypttwrp_static
30-
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
30+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
31+
LOCAL_REQUIRED_MODULES := $(local_additional_dependencies)
32+
else
33+
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
34+
endif
3135
include $(BUILD_STATIC_LIBRARY)
3236

3337
########################################
@@ -42,5 +46,9 @@ LOCAL_C_INCLUDES += $(host_c_includes) $(commands_recovery_local_path)/crypto/sc
4246
LOCAL_LDLIBS += -ldl
4347
LOCAL_MODULE_TAGS := optional
4448
LOCAL_MODULE:= libscrypttwrp_static
45-
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
49+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
50+
LOCAL_REQUIRED_MODULES := $(local_additional_dependencies)
51+
else
52+
LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
53+
endif
4654
include $(BUILD_HOST_STATIC_LIBRARY)

‎minui/Android.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
3232
LOCAL_CFLAGS += -DMSM_BSP
3333
LOCAL_SRC_FILES += graphics_overlay.cpp
3434
ifeq ($(TARGET_PREBUILT_KERNEL),)
35-
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
35+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
36+
LOCAL_REQUIRED_MODULES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
37+
else
38+
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
39+
endif
3640
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
3741
else
3842
ifeq ($(TARGET_CUSTOM_KERNEL_HEADERS),)

‎minuitwrp/Android.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true)
2121
LOCAL_CFLAGS += -DMSM_BSP
2222
LOCAL_SRC_FILES += graphics_overlay.cpp
2323
ifeq ($(TARGET_PREBUILT_KERNEL),)
24-
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
24+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
25+
LOCAL_REQUIRED_MODULES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
26+
else
27+
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
28+
endif
2529
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
2630
else
2731
ifeq ($(TARGET_CUSTOM_KERNEL_HEADERS),)

‎toolbox/Android.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,11 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
307307
include $(CLEAR_VARS)
308308
LOCAL_MODULE := toolbox_symlinks
309309
LOCAL_MODULE_TAGS := optional
310-
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
310+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
311+
LOCAL_REQUIRED_MODULES := $(SYMLINKS)
312+
else
313+
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
314+
endif
311315
include $(BUILD_PHONY_PACKAGE)
312316

313317
ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))

‎toybox/Android.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,11 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
585585
include $(CLEAR_VARS)
586586
LOCAL_MODULE := toybox_symlinks
587587
LOCAL_MODULE_TAGS := optional
588-
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
588+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
589+
LOCAL_REQUIRED_MODULES := $(SYMLINKS)
590+
else
591+
LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
592+
endif
589593
include $(BUILD_PHONY_PACKAGE)
590594

591595
endif

0 commit comments

Comments
 (0)