Merge commit '7d2ba7c'
This commit is contained in:
@@ -60,14 +60,22 @@ INTERNAL_FACTORY_RAMDISK_FILES := $(filter $(TARGET_FACTORY_RAMDISK_OUT)/%, \
|
|||||||
|
|
||||||
ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES))
|
ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES))
|
||||||
|
|
||||||
|
BUILT_FACTORY_RAMDISK_FS := $(PRODUCT_OUT)/factory_ramdisk.gz
|
||||||
BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img
|
BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img
|
||||||
|
|
||||||
INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET)
|
INSTALLED_FACTORY_RAMDISK_FS := $(BUILT_FACTORY_RAMDISK_FS)
|
||||||
$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTFS) \
|
$(INSTALLED_FACTORY_RAMDISK_FS) : $(MKBOOTFS) \
|
||||||
$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES) $(INTERNAL_FACTORY_RAMDISK_FILES) | $(MINIGZIP)
|
$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES) $(INTERNAL_FACTORY_RAMDISK_FILES) | $(MINIGZIP)
|
||||||
$(call pretty,"Target factory ram disk: $@")
|
$(call pretty,"Target factory ram disk file system: $@")
|
||||||
$(hide) $(MKBOOTFS) $(TARGET_FACTORY_RAMDISK_OUT) | $(MINIGZIP) > $@
|
$(hide) $(MKBOOTFS) $(TARGET_FACTORY_RAMDISK_OUT) | $(MINIGZIP) > $@
|
||||||
|
|
||||||
|
TARGET_RAMDISK_KERNEL := $(INSTALLED_KERNEL_TARGET)
|
||||||
|
INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET)
|
||||||
|
$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTIMG) $(TARGET_RAMDISK_KERNEL) $(INSTALLED_FACTORY_RAMDISK_FS)
|
||||||
|
$(call pretty,"Target factory ram disk img format: $@")
|
||||||
|
$(MKBOOTIMG) --kernel $(TARGET_RAMDISK_KERNEL) --ramdisk $(INSTALLED_FACTORY_RAMDISK_FS) \
|
||||||
|
--base $(BOARD_KERNEL_BASE) --output $@
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif # ONE_SHOT_MAKEFILE
|
endif # ONE_SHOT_MAKEFILE
|
||||||
|
Reference in New Issue
Block a user