diff options
Diffstat (limited to '')
| -rw-r--r-- | Android.mk | 229 |
1 files changed, 131 insertions, 98 deletions
diff --git a/Android.mk b/Android.mk index 6880ed2c2..cacd783bb 100644 --- a/Android.mk +++ b/Android.mk @@ -13,6 +13,7 @@ # limitations under the License. LOCAL_PATH := $(call my-dir) +commands_TWRP_local_path := $(LOCAL_PATH) ifdef project-path-for ifeq ($(LOCAL_PATH),$(call project-path-for,recovery)) @@ -114,6 +115,7 @@ LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += bionic ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) LOCAL_C_INCLUDES += external/stlport/stlport external/openssl/include + LOCAL_CFLAGS += -DUSE_FUSE_SIDELOAD22 else LOCAL_C_INCLUDES += external/boringssl/include external/libcxx/include endif @@ -143,6 +145,7 @@ endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0) LOCAL_SHARED_LIBRARIES += libziparchive + LOCAL_C_INCLUDES += $(LOCAL_PATH)/otautil/include else LOCAL_SHARED_LIBRARIES += libminzip LOCAL_CFLAGS += -DUSE_MINZIP @@ -160,11 +163,13 @@ ifeq ($(TW_OEM_BUILD),true) endif ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) - LOCAL_CFLAGS += -DUSE_EXT4 - LOCAL_C_INCLUDES += system/extras/ext4_utils - LOCAL_SHARED_LIBRARIES += libext4_utils - ifneq ($(wildcard external/lz4/Android.mk),) - #LOCAL_STATIC_LIBRARIES += liblz4 + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0) + LOCAL_CFLAGS += -DUSE_EXT4 + LOCAL_C_INCLUDES += system/extras/ext4_utils + LOCAL_SHARED_LIBRARIES += libext4_utils + ifneq ($(wildcard external/lz4/Android.mk),) + #LOCAL_STATIC_LIBRARIES += liblz4 + endif endif endif LOCAL_C_INCLUDES += external/libselinux/include @@ -181,7 +186,7 @@ LOCAL_SHARED_LIBRARIES += libselinux ifeq ($(AB_OTA_UPDATER),true) LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 LOCAL_SHARED_LIBRARIES += libhardware - LOCAL_ADDITIONAL_DEPENDENCIES += libhardware + LOCAL_REQUIRED_MODULES += libhardware endif LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin @@ -362,7 +367,7 @@ endif ifneq ($(TW_CLOCK_OFFSET),) LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET) endif -LOCAL_ADDITIONAL_DEPENDENCIES += \ +LOCAL_REQUIRED_MODULES += \ dump_image \ erase_image \ flash_image \ @@ -390,7 +395,6 @@ else LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker64 endif ifneq ($(TW_USE_TOOLBOX), true) - LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) LOCAL_POST_INSTALL_CMD := \ $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin && \ @@ -398,72 +402,72 @@ ifneq ($(TW_USE_TOOLBOX), true) endif else ifneq ($(wildcard external/toybox/Android.mk),) - LOCAL_ADDITIONAL_DEPENDENCIES += toybox_symlinks + LOCAL_REQUIRED_MODULES += toybox_symlinks endif ifneq ($(wildcard external/zip/Android.mk),) - LOCAL_ADDITIONAL_DEPENDENCIES += zip + LOCAL_REQUIRED_MODULES += zip endif ifneq ($(wildcard external/unzip/Android.mk),) - LOCAL_ADDITIONAL_DEPENDENCIES += unzip + LOCAL_REQUIRED_MODULES += unzip endif endif ifneq ($(TW_NO_EXFAT), true) - LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs fsckexfat + LOCAL_REQUIRED_MODULES += mkexfatfs fsckexfat ifneq ($(TW_NO_EXFAT_FUSE), true) - LOCAL_ADDITIONAL_DEPENDENCIES += exfat-fuse + LOCAL_REQUIRED_MODULES += exfat-fuse endif endif ifeq ($(BOARD_HAS_NO_REAL_SDCARD),) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) - LOCAL_ADDITIONAL_DEPENDENCIES += sgdisk + LOCAL_REQUIRED_MODULES += sgdisk else - LOCAL_ADDITIONAL_DEPENDENCIES += sgdisk_static + LOCAL_REQUIRED_MODULES += sgdisk_static endif endif ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) - LOCAL_ADDITIONAL_DEPENDENCIES += openaes openaes_license + LOCAL_REQUIRED_MODULES += openaes openaes_license endif ifeq ($(TW_INCLUDE_DUMLOCK), true) - LOCAL_ADDITIONAL_DEPENDENCIES += \ + LOCAL_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_ADDITIONAL_DEPENDENCIES += fb2png + LOCAL_REQUIRED_MODULES += fb2png endif ifneq ($(TW_OEM_BUILD),true) - LOCAL_ADDITIONAL_DEPENDENCIES += orscmd + LOCAL_REQUIRED_MODULES += orscmd endif ifeq ($(BOARD_USES_BML_OVER_MTD),true) - LOCAL_ADDITIONAL_DEPENDENCIES += bml_over_mtd + LOCAL_REQUIRED_MODULES += bml_over_mtd endif ifeq ($(TW_INCLUDE_INJECTTWRP), true) - LOCAL_ADDITIONAL_DEPENDENCIES += injecttwrp + LOCAL_REQUIRED_MODULES += injecttwrp endif ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true) - LOCAL_ADDITIONAL_DEPENDENCIES += init.recovery.usb.rc + LOCAL_REQUIRED_MODULES += init.recovery.usb.rc endif ifeq ($(TWRP_INCLUDE_LOGCAT), true) - LOCAL_ADDITIONAL_DEPENDENCIES += logcat + LOCAL_REQUIRED_MODULES += logcat ifeq ($(TARGET_USES_LOGD), true) - LOCAL_ADDITIONAL_DEPENDENCIES += logd libsysutils libnl init.recovery.logd.rc + LOCAL_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_ADDITIONAL_DEPENDENCIES += $(TARGET_RECOVERY_DEVICE_MODULES) + LOCAL_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_ADDITIONAL_DEPENDENCIES += \ + LOCAL_REQUIRED_MODULES += \ mount.ntfs \ fsck.ntfs \ mkfs.ntfs else - LOCAL_ADDITIONAL_DEPENDENCIES += \ + LOCAL_REQUIRED_MODULES += \ ntfs-3g \ ntfsfix \ mkntfs @@ -471,14 +475,14 @@ endif endif ifeq ($(TARGET_USERIMAGES_USE_F2FS), true) ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 3; echo $$?),0) - LOCAL_ADDITIONAL_DEPENDENCIES += \ + LOCAL_REQUIRED_MODULES += \ fsck.f2fs \ mkfs.f2fs endif endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0) - LOCAL_ADDITIONAL_DEPENDENCIES += file_contexts_text + LOCAL_REQUIRED_MODULES += file_contexts_text endif ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),) @@ -494,7 +498,7 @@ LOCAL_MODULE := file_contexts_text LOCAL_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := file_contexts.bin LOCAL_POST_INSTALL_CMD := \ - $(hide) cp -f $(OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts + $(hide) cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts include $(BUILD_PHONY_PACKAGE) @@ -571,9 +575,8 @@ endif # shared libfusesideload # =============================== include $(CLEAR_VARS) -LOCAL_SRC_FILES := fuse_sideload.cpp LOCAL_CLANG := true -LOCAL_CFLAGS := -Wall -Werror +LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE_TAGS := optional @@ -586,14 +589,19 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) else LOCAL_SHARED_LIBRARIES += libcrypto endif +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_SRC_FILES := fuse_sideload22.cpp + LOCAL_CFLAGS += -DUSE_FUSE_SIDELOAD22 +else + LOCAL_SRC_FILES := fuse_sideload.cpp +endif include $(BUILD_SHARED_LIBRARY) # static libfusesideload # =============================== (required to fix build errors in 8.1 due to use by tests) include $(CLEAR_VARS) -LOCAL_SRC_FILES := fuse_sideload.cpp LOCAL_CLANG := true -LOCAL_CFLAGS := -Wall -Werror +LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE_TAGS := optional @@ -606,6 +614,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) else LOCAL_STATIC_LIBRARIES += libcrypto_static endif +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) + LOCAL_SRC_FILES := fuse_sideload22.cpp + LOCAL_CFLAGS += -DUSE_FUSE_SIDELOAD22 +else + LOCAL_SRC_FILES := fuse_sideload.cpp +endif include $(BUILD_STATIC_LIBRARY) # libmounts (static library) @@ -634,6 +648,7 @@ endif LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ libminui \ + libotautil \ libvintf_recovery \ libcrypto_utils \ libcrypto \ @@ -646,6 +661,7 @@ include $(BUILD_STATIC_LIBRARY) # =============================== include $(CLEAR_VARS) + LOCAL_MODULE := libaosprecovery LOCAL_MODULE_TAGS := eng optional LOCAL_CFLAGS := -std=gnu++0x @@ -655,6 +671,7 @@ LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) LOCAL_SHARED_LIBRARIES += libstdc++ libstlport LOCAL_C_INCLUDES += bionic external/stlport/stlport + LOCAL_CFLAGS += -DUSE_FUSE_SIDELOAD22 else LOCAL_SHARED_LIBRARIES += libc++ endif @@ -666,37 +683,49 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) else LOCAL_SHARED_LIBRARIES += libcrypto libbase LOCAL_SRC_FILES += verifier.cpp asn1_decoder.cpp + LOCAL_C_INCLUDES += $(LOCAL_PATH)/otautil/include endif ifeq ($(AB_OTA_UPDATER),true) LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0) - LOCAL_SRC_FILES += otautil/ZipUtil.cpp otautil/SysUtil.cpp + LOCAL_SRC_FILES += otautil/ZipUtil.cpp otautil/SysUtil.cpp otautil/DirUtil.cpp LOCAL_SHARED_LIBRARIES += libziparchive libext4_utils libcrypto libcrypto_utils LOCAL_STATIC_LIBRARIES += libvintf_recovery libfs_mgr liblogwrap libavb libvintf libtinyxml2 libz - LOCAL_WHOLE_STATIC_LIBRARIES += + LOCAL_C_INCLUDES += $(LOCAL_PATH)/otautil/include + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) + # Android 9.0 needs c++17 for libvintf + LOCAL_CPPFLAGS += -std=c++17 + # Android 9.0's libvintf also needs this library + LOCAL_STATIC_LIBRARIES += libhidl-gen-utils + endif else LOCAL_CFLAGS += -DUSE_MINZIP endif include $(BUILD_SHARED_LIBRARY) - -# All the APIs for testing +# libverifier (static library) +# =============================== include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_MODULE := libverifier LOCAL_SRC_FILES := \ asn1_decoder.cpp \ - verifier.cpp \ - ui.cpp -LOCAL_STATIC_LIBRARIES := libcrypto_static + verifier.cpp +LOCAL_STATIC_LIBRARIES := \ + libotautil \ + libcrypto_utils \ + libcrypto \ + libbase +LOCAL_CFLAGS := -Wall -Werror include $(BUILD_STATIC_LIBRARY) # Wear default device # =============================== include $(CLEAR_VARS) LOCAL_SRC_FILES := wear_device.cpp +LOCAL_CFLAGS := -Wall -Werror # Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk. LOCAL_MODULE := librecovery_ui_wear @@ -708,6 +737,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := vr_device.cpp +LOCAL_CFLAGS := -Wall -Werror # should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk LOCAL_MODULE := librecovery_ui_vr @@ -716,20 +746,23 @@ include $(BUILD_STATIC_LIBRARY) commands_recovery_local_path := $(LOCAL_PATH) +# $(LOCAL_PATH)/edify/Android.mk +# $(LOCAL_PATH)/otafault/Android.mk +# $(LOCAL_PATH)/bootloader_message/Android.mk include \ - $(LOCAL_PATH)/applypatch/Android.mk \ - $(LOCAL_PATH)/boot_control/Android.mk \ - $(LOCAL_PATH)/edify/Android.mk \ - $(LOCAL_PATH)/otafault/Android.mk \ - $(LOCAL_PATH)/tests/Android.mk \ - $(LOCAL_PATH)/tools/Android.mk \ - $(LOCAL_PATH)/updater/Android.mk \ - $(LOCAL_PATH)/update_verifier/Android.mk \ - $(LOCAL_PATH)/bootloader_message/Android.mk \ - $(LOCAL_PATH)/bootloader_message_twrp/Android.mk + $(commands_TWRP_local_path)/boot_control/Android.mk \ + $(commands_TWRP_local_path)/tests/Android.mk \ + $(commands_TWRP_local_path)/tools/Android.mk \ + $(commands_TWRP_local_path)/updater/Android.mk \ + $(commands_TWRP_local_path)/update_verifier/Android.mk \ + $(commands_TWRP_local_path)/bootloader_message_twrp/Android.mk + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 25; echo $$?),0) +include $(commands_TWRP_local_path)/bootloader_message/Android.mk +endif ifeq ($(wildcard system/core/uncrypt/Android.mk),) - include $(commands_recovery_local_path)/uncrypt/Android.mk + #include $(commands_TWRP_local_path)/uncrypt/Android.mk endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) @@ -737,81 +770,81 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) TARGET_GLOBAL_CFLAGS += -DTW_USE_MINUI_WITH_DATA CLANG_TARGET_GLOBAL_CFLAGS += -DTW_USE_MINUI_WITH_DATA endif - include $(commands_recovery_local_path)/minadbd/Android.mk \ - $(commands_recovery_local_path)/minui/Android.mk + include $(commands_TWRP_local_path)/minadbd/Android.mk \ + $(commands_TWRP_local_path)/minui/Android.mk else TARGET_GLOBAL_CFLAGS += -DTW_USE_MINUI_21 - include $(commands_recovery_local_path)/minadbd21/Android.mk \ - $(commands_recovery_local_path)/minui21/Android.mk + include $(commands_TWRP_local_path)/minadbd21/Android.mk \ + $(commands_TWRP_local_path)/minui21/Android.mk endif +#$(commands_TWRP_local_path)/otautil/Android.mk #includes for TWRP -include $(commands_recovery_local_path)/injecttwrp/Android.mk \ - $(commands_recovery_local_path)/htcdumlock/Android.mk \ - $(commands_recovery_local_path)/gui/Android.mk \ - $(commands_recovery_local_path)/mmcutils/Android.mk \ - $(commands_recovery_local_path)/bmlutils/Android.mk \ - $(commands_recovery_local_path)/prebuilt/Android.mk \ - $(commands_recovery_local_path)/mtdutils/Android.mk \ - $(commands_recovery_local_path)/flashutils/Android.mk \ - $(commands_recovery_local_path)/pigz/Android.mk \ - $(commands_recovery_local_path)/libtar/Android.mk \ - $(commands_recovery_local_path)/libcrecovery/Android.mk \ - $(commands_recovery_local_path)/libblkid/Android.mk \ - $(commands_recovery_local_path)/minuitwrp/Android.mk \ - $(commands_recovery_local_path)/otautil/Android.mk \ - $(commands_recovery_local_path)/openaes/Android.mk \ - $(commands_recovery_local_path)/toolbox/Android.mk \ - $(commands_recovery_local_path)/twrpTarMain/Android.mk \ - $(commands_recovery_local_path)/mtp/Android.mk \ - $(commands_recovery_local_path)/minzip/Android.mk \ - $(commands_recovery_local_path)/dosfstools/Android.mk \ - $(commands_recovery_local_path)/etc/Android.mk \ - $(commands_recovery_local_path)/toybox/Android.mk \ - $(commands_recovery_local_path)/simg2img/Android.mk \ - $(commands_recovery_local_path)/adbbu/Android.mk \ - $(commands_recovery_local_path)/libpixelflinger/Android.mk \ - $(commands_recovery_local_path)/twrpDigest/Android.mk \ - $(commands_recovery_local_path)/attr/Android.mk +include $(commands_TWRP_local_path)/injecttwrp/Android.mk \ + $(commands_TWRP_local_path)/htcdumlock/Android.mk \ + $(commands_TWRP_local_path)/gui/Android.mk \ + $(commands_TWRP_local_path)/mmcutils/Android.mk \ + $(commands_TWRP_local_path)/bmlutils/Android.mk \ + $(commands_TWRP_local_path)/prebuilt/Android.mk \ + $(commands_TWRP_local_path)/mtdutils/Android.mk \ + $(commands_TWRP_local_path)/flashutils/Android.mk \ + $(commands_TWRP_local_path)/pigz/Android.mk \ + $(commands_TWRP_local_path)/libtar/Android.mk \ + $(commands_TWRP_local_path)/libcrecovery/Android.mk \ + $(commands_TWRP_local_path)/libblkid/Android.mk \ + $(commands_TWRP_local_path)/minuitwrp/Android.mk \ + $(commands_TWRP_local_path)/openaes/Android.mk \ + $(commands_TWRP_local_path)/toolbox/Android.mk \ + $(commands_TWRP_local_path)/twrpTarMain/Android.mk \ + $(commands_TWRP_local_path)/mtp/Android.mk \ + $(commands_TWRP_local_path)/minzip/Android.mk \ + $(commands_TWRP_local_path)/dosfstools/Android.mk \ + $(commands_TWRP_local_path)/etc/Android.mk \ + $(commands_TWRP_local_path)/toybox/Android.mk \ + $(commands_TWRP_local_path)/simg2img/Android.mk \ + $(commands_TWRP_local_path)/adbbu/Android.mk \ + $(commands_TWRP_local_path)/libpixelflinger/Android.mk \ + $(commands_TWRP_local_path)/twrpDigest/Android.mk \ + $(commands_TWRP_local_path)/attr/Android.mk ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) - include $(commands_recovery_local_path)/libmincrypt/Android.mk + include $(commands_TWRP_local_path)/libmincrypt/Android.mk endif ifeq ($(TW_INCLUDE_CRYPTO), true) - include $(commands_recovery_local_path)/crypto/lollipop/Android.mk - include $(commands_recovery_local_path)/crypto/scrypt/Android.mk + include $(commands_TWRP_local_path)/crypto/lollipop/Android.mk + include $(commands_TWRP_local_path)/crypto/scrypt/Android.mk ifeq ($(TW_INCLUDE_CRYPTO_FBE), true) - include $(commands_recovery_local_path)/crypto/ext4crypt/Android.mk + include $(commands_TWRP_local_path)/crypto/ext4crypt/Android.mk endif ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),) ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),false) - include $(commands_recovery_local_path)/crypto/vold_decrypt/Android.mk + include $(commands_TWRP_local_path)/crypto/vold_decrypt/Android.mk endif endif - include $(commands_recovery_local_path)/gpt/Android.mk + include $(commands_TWRP_local_path)/gpt/Android.mk endif ifeq ($(BUILD_ID), GINGERBREAD) TW_NO_EXFAT := true endif ifneq ($(TW_NO_EXFAT), true) - include $(commands_recovery_local_path)/exfat/mkfs/Android.mk \ - $(commands_recovery_local_path)/exfat/fsck/Android.mk \ - $(commands_recovery_local_path)/fuse/Android.mk \ - $(commands_recovery_local_path)/exfat/libexfat/Android.mk + include $(commands_TWRP_local_path)/exfat/mkfs/Android.mk \ + $(commands_TWRP_local_path)/exfat/fsck/Android.mk \ + $(commands_TWRP_local_path)/fuse/Android.mk \ + $(commands_TWRP_local_path)/exfat/libexfat/Android.mk ifneq ($(TW_NO_EXFAT_FUSE), true) - include $(commands_recovery_local_path)/exfat/fuse/Android.mk + include $(commands_TWRP_local_path)/exfat/fuse/Android.mk endif endif ifneq ($(TW_OEM_BUILD),true) - include $(commands_recovery_local_path)/orscmd/Android.mk + include $(commands_TWRP_local_path)/orscmd/Android.mk endif # FB2PNG ifeq ($(TW_INCLUDE_FB2PNG), true) - include $(commands_recovery_local_path)/fb2png/Android.mk + include $(commands_TWRP_local_path)/fb2png/Android.mk endif -commands_recovery_local_path := - endif + +commands_TWRP_local_path := |