StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix rebuilding with whitelisted_files" am: 70b0162472 am: d54b9ceacc

Browse Source 
Change-Id: I28ed01457dc80a105937fca5dd4a2fb07bb20e37
This commit is contained in:
Automerger Merge Worker
2020-01-29 02:22:09 +00:00
parent 48af2f59c4 d54b9ceacc
commit b44012d8fb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@@ -160,7 +160,7 @@ var (
`echo -e "New unexpected files were added to ${apex_module_name}." ` + `echo -e "New unexpected files were added to ${apex_module_name}." ` +
` "To fix the build run following command:" && ` + ` "To fix the build run following command:" && ` +
`echo "system/apex/tools/update_whitelist.sh ${whitelisted_files_file} ${image_content_file}" && ` + `echo "system/apex/tools/update_whitelist.sh ${whitelisted_files_file} ${image_content_file}" && ` +
`exit 1)`, `exit 1); touch ${out}`,
Description: "Diff ${image_content_file} and ${whitelisted_files_file}", Description: "Diff ${image_content_file} and ${whitelisted_files_file}",
}, "image_content_file", "whitelisted_files_file", "apex_module_name") }, "image_content_file", "whitelisted_files_file", "apex_module_name")
) )