update-spirv-tools.sh: add missing rms of Android.mk
Change-Id: I2b229f6e2fc288d980a93b908d140a9e6afa48ff
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/73368
Tested-by: Romaric Jodin <rjodin@chromium.org>
Presubmit-Ready: Romaric Jodin <rjodin@chromium.org>
Reviewed-by: Geoff Lang <geofflang@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
diff --git a/third_party/update-spirvtools.sh b/third_party/update-spirvtools.sh
index 0cd19c0..ca6432b 100755
--- a/third_party/update-spirvtools.sh
+++ b/third_party/update-spirvtools.sh
@@ -18,6 +18,8 @@
# CONFLICT is very likely due to Android.mk being deleted in our third_party.
# Delete it, and try to continue.
git rm ${THIRD_PARTY_DIR}/SPIRV-Tools/Android.mk
+ git rm ${THIRD_PARTY_DIR}/SPIRV-Tools/android_test/Android.mk
+ git rm ${THIRD_PARTY_DIR}/SPIRV-Tools/android_test/jni/Application.mk
git -c core.editor=true merge --continue # '-c core.editor=true' prevents the editor from showing
if [ $? -ne 0 ]; then
echo "Could not automatically resolve conflicts."
