LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I23789ff1fa3119dd7bd70bac7439409ea72fbc2f
This commit is contained in:
Bill Peckham
2020-10-22 21:07:37 +00:00
committed by Automerger Merge Worker
parent 7d6785b6d8 7f81f5473b
commit 5c54fd6dab
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vendor_snapshot/update.py
View File

@@ -241,9 +241,6 @@ def build_props(install_dir):
target_arch)
module_name = prop['name']
notice_path = 'NOTICE_FILES/' + module_name + '.txt'
if os.path.exists(os.path.join(bp_dir, notice_path)):
prop['notice'] = notice_path
# Is this sanitized variant?
if 'sanitize' in prop:
@@ -254,7 +251,11 @@ def build_props(install_dir):
for k in list(prop.keys()):
if not k in SANITIZER_VARIANT_PROPS:
del prop[k]
prop = {sanitizer_type: prop}
prop = {'name': module_name, sanitizer_type: prop}
notice_path = 'NOTICE_FILES/' + module_name + '.txt'
if os.path.exists(os.path.join(bp_dir, notice_path)):
prop['notice'] = notice_path
variation_dict = props[target_arch][variation]
if not module_name in variation_dict: