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

Commit 683c493c authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set. 

With this change, if BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is unset, a
target will be declared for super.img so it becomes possible to build it
(e.g. with `m superimage`), but it will not be part of the default `droid`
target. This is useful for building a `super.img` on targets that do
not normally need one without needing to go through a slow `m dist` step.

Change-Id: I599e93b3fc41fc2c0642761fcda757c40e2736d6
parent 294aeed6

core/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -6547,22 +6547,22 @@ INSTALLED_SUPERIMAGE_DEPENDENCIES += $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) 
endif

endif



# If BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is set, super.img is built from images in the

# $(PRODUCT_OUT) directory, and is built to $(PRODUCT_OUT)/super.img. Also, it will

# be built for non-dist builds. This is useful for devices that uses super.img directly, e.g.

# virtual devices.

ifeq (true,$(BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT))

$(INSTALLED_SUPERIMAGE_TARGET): $(INSTALLED_SUPERIMAGE_DEPENDENCIES)

	$(call pretty,"Target super fs image for debug: $@")

	$(call build-superimage-target,$(INSTALLED_SUPERIMAGE_TARGET),\

          $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt)



droidcore-unbundled: $(INSTALLED_SUPERIMAGE_TARGET)



# For devices that uses super image directly, the superimage target points to the file in $(PRODUCT_OUT).

.PHONY: superimage

superimage: $(INSTALLED_SUPERIMAGE_TARGET)



# If BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is set, super.img is built from images in the

# $(PRODUCT_OUT) directory, and is built to $(PRODUCT_OUT)/super.img. Also, it will

# be built for non-dist builds. This is useful for devices that uses super.img directly, e.g.

# virtual devices.

ifeq (true,$(BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT))

droidcore-unbundled: $(INSTALLED_SUPERIMAGE_TARGET)



$(call dist-for-goals,dist_files,$(INSTALLED_MISC_INFO_TARGET):super_misc_info.txt)

endif # BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT