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

Commit cff38625 authored by Ying Wang's avatar Ying Wang
Browse files

Include vendor.img in PDK build. 

- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
  build.

Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
parent 683d9867

core/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -1005,6 +1005,10 @@ $(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) 
		$(TARGET_COPY_OUT_SYSTEM) \

		$(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES)) \

		$(addprefix symbols/,$(PDK_SYMBOL_FILES_LIST))

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

	$(hide) cd $(dir $@) && zip -qry $(notdir $@) \

		$(TARGET_COPY_OUT_VENDOR)

endif

ifneq ($(PDK_PLATFORM_JAVA_ZIP_CONTENTS),)

	$(hide) cd $(OUT_DIR) && zip -qry $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)

endif
@@ -1151,7 +1155,12 @@ endif # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE 
# vendor partition image

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

INTERNAL_VENDORIMAGE_FILES := \

    $(filter $(TARGET_OUT_VENDOR)/%,$(ALL_DEFAULT_INSTALLED_MODULES))

    $(filter $(TARGET_OUT_VENDOR)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES))



# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)



vendorimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,vendor)