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

Commit 187e9759 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "gki_vintf_level" 

* changes:
  Pass kernel release file to check_vintf.
  Pass kernel version file to check_vintf.
parents 59dd38cd b95d02ea

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3750,7 +3750,7 @@ $(BUILT_KERNEL_CONFIGS_FILE): $(foreach pair,$(my_decompress_tools),$(call word- 
$(BUILT_KERNEL_CONFIGS_FILE): $(EXTRACT_KERNEL) $(firstword $(INSTALLED_KERNEL_TARGET))

	$< --tools $(PRIVATE_DECOMPRESS_TOOLS) --input $(firstword $(INSTALLED_KERNEL_TARGET)) \

	  --output-configs $@ \

	  --output-version $(BUILT_KERNEL_VERSION_FILE)

	  --output-release $(BUILT_KERNEL_VERSION_FILE)



my_decompress_tools :=
@@ -3759,7 +3759,7 @@ my_board_extracted_kernel := 


endif # INSTALLED_KERNEL_TARGET



check_vintf_compatible_args += --kernel $$(cat $(BUILT_KERNEL_VERSION_FILE)):$(BUILT_KERNEL_CONFIGS_FILE)

check_vintf_compatible_args += --kernel $(BUILT_KERNEL_VERSION_FILE):$(BUILT_KERNEL_CONFIGS_FILE)

check_vintf_compatible_deps += $(BUILT_KERNEL_CONFIGS_FILE) $(BUILT_KERNEL_VERSION_FILE)



endif # PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS

tools/releasetools/check_target_files_vintf.py

+1 −4
Original line number Diff line number Diff line
@@ -100,10 +100,7 @@ def GetArgsForKernel(input_tmp): 
                'PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS is not set')

    return []



  with open(version_path) as f:

    version = f.read().strip()



  return ['--kernel', '{}:{}'.format(version, config_path)]

  return ['--kernel', '{}:{}'.format(version_path, config_path)]





def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None):