From 2870d1e3c17c82a14954102922b5eb9b0536786a Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 19 Dec 2019 13:58:00 -0800 Subject: [PATCH] Add /system/vendor/odm for VINTF search path Compared with board_config.mk and found this one is missing. Also add docs to explain where are these values from. Test: pass Change-Id: Ic22d75a538657bd286edcae6d95f9ee462911975 --- tools/releasetools/check_target_files_vintf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/check_target_files_vintf.py b/tools/releasetools/check_target_files_vintf.py index 543147c981..a556f5380d 100755 --- a/tools/releasetools/check_target_files_vintf.py +++ b/tools/releasetools/check_target_files_vintf.py @@ -38,11 +38,13 @@ OPTIONS = common.OPTIONS # paths (VintfObject.cpp). # These paths are stored in different directories in target files package, so # we have to search for the correct path and tell checkvintf to remap them. +# Look for TARGET_COPY_OUT_* variables in board_config.mk for possible paths for +# each partition. DIR_SEARCH_PATHS = { '/system': ('SYSTEM',), '/vendor': ('VENDOR', 'SYSTEM/vendor'), '/product': ('PRODUCT', 'SYSTEM/product'), - '/odm': ('ODM', 'VENDOR/odm'), + '/odm': ('ODM', 'VENDOR/odm', 'SYSTEM/vendor/odm'), } UNZIP_PATTERN = ['META/*', '*/build.prop']