Skip to content

A
angle
Commit 1589de9e by Geoff Lang Committed by Commit Bot
Options

Remove some bad files when generating an ANGLE roll into Android

Add a list of files that should be removed when rolling ANGLE into Android. The jsoncpp OWNERS file fails to upload to the Android gerrit because it contains owners that have never signed into the Android gerrit. BUG=b:150892231 Change-Id: I699dada53cdda2fbd012733a7a91eb8b5fb79d35 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152668 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 943c3bc1
Showing with 9 additions and 0 deletions
scripts/roll_aosp.sh
...@@ -76,4 +76,13 @@ for dep in ${deps[@]}; do ...@@ -76,4 +76,13 @@ for dep in ${deps[@]}; do
git add -f $dep git add -f $dep
done done
extra_removal_files=(
# The jsoncpp OWNERS file contains users that have not logged into the Android gerrit so it fails to upload.
"third_party/jsoncpp/OWNERS"
)
for removal_file in ${extra_removal_files[@]}; do
git rm $removal_file
done
git commit --amend --no-edit git commit --amend --no-edit
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