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

Commit 930ceb30 authored by Luis Hector Chavez's avatar Luis Hector Chavez Committed by android-build-merger
Browse files

Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE" 

am: b676d6d6

Change-Id: I0e13f4327ce066a56f856985c07f1e8f4c373d24
parents cab74081 b676d6d6

core/Makefile

+19 −1
Original line number Diff line number Diff line
@@ -684,11 +684,23 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ 
	$(ALL_GENERATED_SOURCES) \

	$(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_ROOT := $(PRODUCT_OUT)/installed-files-root.txt

INSTALLED_FILES_JSON_ROOT := $(INSTALLED_FILES_FILE_ROOT:.txt=.json)

$(INSTALLED_FILES_FILE_ROOT): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_ROOT)

$(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST)

	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) $(FILESLIST) $(TARGET_ROOT_OUT) > $(@:.txt=.json)

	$(hide) build/make/tools/fileslist_util.py -c $(@:.txt=.json) > $@



$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))



BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img



# We just build this directly to the install location.

INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET)

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) | $(MINIGZIP)

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_ROOT) | $(MINIGZIP)

	$(call pretty,"Target ram disk: $@")

	$(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@
@@ -1532,6 +1544,12 @@ ifneq (,$(SANITIZE_TARGET)) 
  endif

endif



# When building a system root image, also add the ramdisk image as a dependency

# to ensure all files in it are built before it is created.

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

  FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_ROOT)

endif



# -----------------------------------------------------------------

# Final System VINTF manifest including fragments. This is not assembled

# on the device because it depends on everything in a given device

core/main.mk

+7 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,13 @@ else # TARGET_BUILD_APPS 
  endif

  endif



  ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

    $(call dist-for-goals, droidcore, \

      $(INSTALLED_FILES_FILE_ROOT) \

      $(INSTALLED_FILES_JSON_ROOT) \

    )

  endif



  ifeq ($(EMMA_INSTRUMENT),true)

    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE)

    $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))