Skip to content

A
angle
Commit 8116c488 by Geoff Lang Committed by Commit Bot
Options

Remove the merge command from roll_aosp.sh

There are two issues doing the merge in the script: - This command makes the merge specific to an AOSP branch - It uses the version of roll_aosp that is from the previous roll instead of the ToT version. BUG=b:150892231 Change-Id: I579484092ca3d8c5e0e2d4d4bd1272eaeccc9da3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152667Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 1589de9e
Showing with 0 additions and 2 deletions
scripts/roll_aosp.sh
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
# #
# Generates a roll CL within the ANGLE repository of AOSP. # Generates a roll CL within the ANGLE repository of AOSP.
git merge -X theirs aosp/upstream-mirror
deps=( deps=(
"third_party/spirv-tools/src" "third_party/spirv-tools/src"
"third_party/glslang/src" "third_party/glslang/src"
......
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