Skip to content

A
angle
Commit e70b1527 by Geoff Lang Committed by Geoff Lang
Options

Always use the -f flag with rm in roll_aosp.sh

rm will error when the file is missing without the -f flag. We delete a few files without checking that they exist first. Bug: b/150458033 Change-Id: I5a104d383f59d418eaa55534526194f626c88f57 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2523372Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent a9415a85
Showing with 3 additions and 3 deletions
scripts/roll_aosp.sh
...@@ -57,7 +57,7 @@ abis=( ...@@ -57,7 +57,7 @@ abis=(
"x64" "x64"
) )
rm -r ${GN_OUTPUT_DIRECTORY} rm -rf ${GN_OUTPUT_DIRECTORY}
for abi in ${abis[@]}; do for abi in ${abis[@]}; do
# generate gn build files and convert them to blueprints # generate gn build files and convert them to blueprints
gn_args=( gn_args=(
...@@ -107,7 +107,7 @@ python scripts/generate_android_bp.py \ ...@@ -107,7 +107,7 @@ python scripts/generate_android_bp.py \
${GN_OUTPUT_DIRECTORY}/desc.x86.json \ ${GN_OUTPUT_DIRECTORY}/desc.x86.json \
${GN_OUTPUT_DIRECTORY}/desc.x64.json > Android.bp ${GN_OUTPUT_DIRECTORY}/desc.x64.json > Android.bp
rm -r ${GN_OUTPUT_DIRECTORY} rm -rf ${GN_OUTPUT_DIRECTORY}
git add Android.bp git add Android.bp
# Delete the .git files in each dep so that it can be added to this repo. Some deps like jsoncpp # Delete the .git files in each dep so that it can be added to this repo. Some deps like jsoncpp
...@@ -130,7 +130,7 @@ extra_removal_files=( ...@@ -130,7 +130,7 @@ extra_removal_files=(
) )
for removal_file in ${extra_removal_files[@]}; do for removal_file in ${extra_removal_files[@]}; do
rm $removal_file rm -f $removal_file
done done
for dep in ${deps[@]} ${add_only_deps[@]}; do for dep in ${deps[@]} ${add_only_deps[@]}; do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment