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

Commit b8ecdfdd authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "vendor_sku" am: d6077aa7 

Change-Id: I04110226940c773fff84db341665a3a4b923d720
parents 01f66b11 d6077aa7

core/Makefile

+15 −3
Original line number Diff line number Diff line
@@ -3722,8 +3722,12 @@ ifneq ($(check_vintf_vendor_deps),) 
check_vintf_has_vendor := true

check_vintf_vendor_log := $(intermediates)/check_vintf_vendor_log

check_vintf_all_deps += $(check_vintf_vendor_log)

# Check vendor SKU=(empty) case when:

# - DEVICE_MANIFEST_FILE is not empty; OR

# - DEVICE_MANIFEST_FILE is empty AND DEVICE_MANIFEST_SKUS is empty (only vendor manifest fragments are used)

$(check_vintf_vendor_log): PRIVATE_VENDOR_SKUS := \

  $(if $(DEVICE_MANIFEST_FILE),EMPTY_VENDOR_SKU_PLACEHOLDER) \

  $(if $(DEVICE_MANIFEST_FILE),EMPTY_VENDOR_SKU_PLACEHOLDER,\

    $(if $(DEVICE_MANIFEST_SKUS),,EMPTY_VENDOR_SKU_PLACEHOLDER)) \

  $(DEVICE_MANIFEST_SKUS)

$(check_vintf_vendor_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_vendor_deps)

	$(foreach vendor_sku,$(PRIVATE_VENDOR_SKUS), \
@@ -3823,11 +3827,19 @@ endif # PRODUCT_SHIPPING_API_LEVEL 


$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_ARGS := $(check_vintf_compatible_args)

$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_DEPS := $(check_vintf_compatible_deps)

# Check ODM SKU=(empty) case when:

# - ODM_MANIFEST_FILES is not empty; OR

# - ODM_MANIFEST_FILES is empty AND ODM_MANIFEST_SKUS is empty (only ODM manifest fragments are used)

$(check_vintf_compatible_log): PRIVATE_ODM_SKUS := \

  $(if $(ODM_MANIFEST_FILES),EMPTY_ODM_SKU_PLACEHOLDER) \

  $(if $(ODM_MANIFEST_FILES),EMPTY_ODM_SKU_PLACEHOLDER,\

    $(if $(ODM_MANIFEST_SKUS),,EMPTY_ODM_SKU_PLACEHOLDER)) \

  $(ODM_MANIFEST_SKUS)

# Check vendor SKU=(empty) case when:

# - DEVICE_MANIFEST_FILE is not empty; OR

# - DEVICE_MANIFEST_FILE is empty AND DEVICE_MANIFEST_SKUS is empty (only vendor manifest fragments are used)

$(check_vintf_compatible_log): PRIVATE_VENDOR_SKUS := \

  $(if $(DEVICE_MANIFEST_FILE),EMPTY_VENDOR_SKU_PLACEHOLDER) \

  $(if $(DEVICE_MANIFEST_FILE),EMPTY_VENDOR_SKU_PLACEHOLDER,\

    $(if $(DEVICE_MANIFEST_SKUS),,EMPTY_VENDOR_SKU_PLACEHOLDER)) \

  $(DEVICE_MANIFEST_SKUS)

$(check_vintf_compatible_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_compatible_deps)

	@echo -n -e 'Deps: \n  ' > $@

target/board/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/vintf 
GEN := $$(local-generated-sources-dir)/manifest_$(1).xml

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

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

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \

	PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \

	PRODUCT_SHIPPING_API_LEVEL=$(PRODUCT_SHIPPING_API_LEVEL) \

	BOARD_SEPOLICY_VERS=$$(BOARD_SEPOLICY_VERS) \

	PRODUCT_ENFORCE_VINTF_MANIFEST=$$(PRODUCT_ENFORCE_VINTF_MANIFEST) \

	PRODUCT_SHIPPING_API_LEVEL=$$(PRODUCT_SHIPPING_API_LEVEL) \

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

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

tools/releasetools/check_target_files_vintf.py

+3 −2
Original line number Diff line number Diff line
@@ -68,11 +68,12 @@ def GetDirmap(input_tmp): 


def GetArgsForSkus(info_dict):

  odm_skus = info_dict.get('vintf_odm_manifest_skus', '').strip().split()

  if info_dict.get('vintf_include_empty_odm_sku', '') == "true":

  if info_dict.get('vintf_include_empty_odm_sku', '') == "true" or not odm_skus:

    odm_skus += ['']



  vendor_skus = info_dict.get('vintf_vendor_manifest_skus', '').strip().split()

  if info_dict.get('vintf_include_empty_vendor_sku', '') == "true":

  if info_dict.get('vintf_include_empty_vendor_sku', '') == "true" or \

      not vendor_skus:

    vendor_skus += ['']



  return [['--property', 'ro.boot.product.hardware.sku=' + odm_sku,