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

Commit b321665b authored by Yifan Hong's avatar Yifan Hong
Browse files

Build ODM manifests and fragments for each SKU. 

In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3
parent da4ee462

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,8 @@ endef 
define auto-included-modules

  $(if $(BOARD_VNDK_VERSION),vndk_package) \

  $(if $(DEVICE_MANIFEST_FILE),device_manifest.xml) \

  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

  $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \



endef

target/board/Android.mk

+56 −0
Original line number Diff line number Diff line
@@ -52,3 +52,59 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) 
include $(BUILD_PREBUILT)

BUILT_VENDOR_MANIFEST := $(LOCAL_BUILT_MODULE)

endif



# ODM manifest

ifdef ODM_MANIFEST_FILES

# ODM_MANIFEST_FILES is a list of files that is combined and installed as the default ODM manifest.

include $(CLEAR_VARS)

LOCAL_MODULE := odm_manifest.xml

LOCAL_MODULE_STEM := manifest.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_RELATIVE_PATH := vintf

LOCAL_ODM_MODULE := true



GEN := $(local-generated-sources-dir)/manifest.xml

$(GEN): PRIVATE_SRC_FILES := $(ODM_MANIFEST_FILES)

$(GEN): $(ODM_MANIFEST_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	# Set VINTF_IGNORE_TARGET_FCM_VERSION to true because it should only be in device manifest.

	VINTF_IGNORE_TARGET_FCM_VERSION=true \

	$(HOST_OUT_EXECUTABLES)/assemble_vintf -o $@ \

		-i $(call normalize-path-list,$(PRIVATE_SRC_FILES))



LOCAL_PREBUILT_MODULE_FILE := $(GEN)

include $(BUILD_PREBUILT)

endif # ODM_MANIFEST_FILES



# ODM_MANIFEST_SKUS: a list of SKUS where ODM_MANIFEST_<sku>_FILES are defined.

ifdef ODM_MANIFEST_SKUS



# Install /odm/etc/vintf/manifest_$(sku).xml

# $(1): sku

define _add_odm_sku_manifest

my_fragment_files_var := ODM_MANIFEST_$$(call to-upper,$(1))_FILES

ifndef $$(my_fragment_files_var)

$$(error $(1) is in ODM_MANIFEST_SKUS but $$(my_fragment_files_var) is not defined)

endif

my_fragment_files := $$($$(my_fragment_files_var))

include $$(CLEAR_VARS)

LOCAL_MODULE := odm_manifest_$(1).xml

LOCAL_MODULE_STEM := manifest_$(1).xml

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_RELATIVE_PATH := vintf

LOCAL_ODM_MODULE := true

GEN := $$(local-generated-sources-dir)/manifest_$(1).xml

$$(GEN): PRIVATE_SRC_FILES := $$(my_fragment_files)

$$(GEN): $$(my_fragment_files) $$(HOST_OUT_EXECUTABLES)/assemble_vintf

	VINTF_IGNORE_TARGET_FCM_VERSION=true \

	$$(HOST_OUT_EXECUTABLES)/assemble_vintf -o $$@ \

		-i $$(call normalize-path-list,$$(PRIVATE_SRC_FILES))

LOCAL_PREBUILT_MODULE_FILE := $$(GEN)

include $$(BUILD_PREBUILT)

my_fragment_files_var :=

my_fragment_files :=

endef



$(foreach sku, $(ODM_MANIFEST_SKUS), $(eval $(call _add_odm_sku_manifest,$(sku))))

_add_odm_sku_manifest :=



endif # ODM_MANIFEST_SKUS