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

Commit 71f0b849 authored by Tom Marshall's avatar Tom Marshall Committed by Gerrit Code Review
Browse files

build: recovery: Remove INTERNAL_RECOVERY_FILES 

INTERNAL_RECOVERY_FILES picks up all packages that install files into
TARGET_RECOVERY_OUT.  This is not necessarily desirable and circumvents
the normal PRODUCT_PACKAGES mechanism.

Change-Id: I66f38a6afed7ade19a50a321d3b2d197137ba3a7
Related: http://review.cyanogenmod.org/#/c/74243/
parent f27c277c

core/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -724,9 +724,6 @@ endif 
ifneq ($(BOARD_FORCE_RAMDISK_ADDRESS),)

  INTERNAL_RECOVERYIMAGE_ARGS += --ramdiskaddr $(BOARD_FORCE_RAMDISK_ADDRESS)

endif

INTERNAL_RECOVERY_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \

	$(foreach module, $(ALL_MODULES), $(ALL_MODULES.$(module).INSTALLED)) \

	$(ALL_DEFAULT_INSTALLED_MODULES))



# Keys authorized to sign OTA packages this build will accept.  The

# build always uses dev-keys for this; release packaging tools will
@@ -757,7 +754,7 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 


TARGET_RECOVERY_ROOT_TIMESTAMP := $(TARGET_RECOVERY_OUT)/root.ts



$(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \

$(TARGET_RECOVERY_ROOT_TIMESTAMP): \

		$(INSTALLED_RAMDISK_TARGET) \

		$(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) \

		$(recovery_binary) \