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

Commit baacc3a7 authored by Dan Willemsen's avatar Dan Willemsen Committed by Bill Yi
Browse files

Clean up vendor image handling - DO NOT MERGE 

Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.

Support using a prebuilt vendor image and including it into all the
normal packaging steps.

Bug: 31545062
Bug: 28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96
parent be56d3b2

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ systemimage_intermediates := \ 
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img



# Create symlink /system/vendor to /vendor if necessary.

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

ifdef BOARD_USES_VENDORIMAGE

define create-system-vendor-symlink

$(hide) if [ -d $(TARGET_OUT)/vendor ] && [ ! -h $(TARGET_OUT)/vendor ]; then \

  echo 'Non-symlink $(TARGET_OUT)/vendor detected!' 1>&2; \
@@ -1519,7 +1519,10 @@ $(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIM 
vendorimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)

	$(build-vendorimage-target)



endif # BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

else ifdef BOARD_PREBUILT_VENDORIMAGE

INSTALLED_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img

$(eval $(call copy-one-file,$(BOARD_PREBUILT_VENDORIMAGE),$(INSTALLED_VENDORIMAGE_TARGET)))

endif



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

# bring in the installer image generation defines if necessary
@@ -1884,6 +1887,10 @@ endif 
ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

ifdef BOARD_PREBUILT_VENDORIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDORIMAGE_TARGET) $(zip_root)/IMAGES/

endif

	@# Zip everything up, preserving symlinks and placing META/ files first to

	@# help early validation of the .zip file while uploading it.
@@ -1906,7 +1913,7 @@ ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET 
endif

	$(hide) (cd $(zip_root) && zip -qX ../$(notdir $@) META/*filesystem_config.txt)

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    ./build/tools/releasetools/add_img_to_target_files -v -p $(HOST_OUT) $@

	    ./build/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $@



.PHONY: target-files-package

target-files-package: $(BUILT_TARGET_FILES_PACKAGE)

core/envsetup.mk

+13 −0
Original line number Diff line number Diff line
@@ -173,6 +173,19 @@ else ifeq ($(filter vendor system/vendor,$(TARGET_COPY_OUT_VENDOR)),) 
$(error TARGET_COPY_OUT_VENDOR must be either 'vendor' or 'system/vendor', seeing '$(TARGET_COPY_OUT_VENDOR)'.)

endif

PRODUCT_COPY_FILES := $(subst $(_vendor_path_placeholder),$(TARGET_COPY_OUT_VENDOR),$(PRODUCT_COPY_FILES))



BOARD_USES_VENDORIMAGE :=

ifdef BOARD_PREBUILT_VENDORIMAGE

BOARD_USES_VENDORIMAGE := true

endif

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

BOARD_USES_VENDORIMAGE := true

endif

ifeq ($(TARGET_COPY_OUT_VENDOR),vendor)

BOARD_USES_VENDORIMAGE := true

else ifdef BOARD_USES_VENDORIMAGE

$(error TARGET_COPY_OUT_VENDOR must be set to 'vendor' to use a vendor image)

endif

###########################################