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

Commit 72e78f21 authored by Yifan Hong's avatar Yifan Hong
Browse files

Pass kernel version file to check_vintf. 

check_vintf now accept a path to a file that contains the kernel
version string. Use it.

Test: m check-vintf-all and manual inspect
Bug: 161317193
Change-Id: I4812c93f352686d73c5832d59e43a297d93e67a2
parent 4cecc437

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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):