Skip to content

A
angle
Commit 005793e4 by Geoff Lang Committed by Commit Bot
Options

Remove --preserve-root from roll_aosp.sh

This flag is not supported on mac and generates errors when trying to roll. BUG=b:150892231 Change-Id: I22d10a2b9b37610d409df4d72e0aba2672f7b192 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152666Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 6b705ae7
Showing with 2 additions and 2 deletions
scripts/roll_aosp.sh
...@@ -20,7 +20,7 @@ deps=( ...@@ -20,7 +20,7 @@ deps=(
# Delete dep directories so that gclient can check them out # Delete dep directories so that gclient can check them out
for dep in ${deps[@]}; do for dep in ${deps[@]}; do
rm -rf --preserve-root $dep rm -rf $dep
done done
# Sync all of ANGLE's deps so that 'gn gen' works # Sync all of ANGLE's deps so that 'gn gen' works
...@@ -69,7 +69,7 @@ git add Android.bp ...@@ -69,7 +69,7 @@ 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
# have multiple layers of deps so delete everything before adding them. # have multiple layers of deps so delete everything before adding them.
for dep in ${deps[@]}; do for dep in ${deps[@]}; do
rm -rf --preserve-root $dep/.git rm -rf $dep/.git
done done
for dep in ${deps[@]}; do for dep in ${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