Be more specific when deleting unused third_party/ dirs

The command to delete unused third_party/ directories needs to be more specific to delete unused third_party/vulkan-deps/ directories. Additionally, use the flag '-path', since that's more portable than '-wholename' which is GNU-specific. Bug: b/187342779 Change-Id: Ie8b02360d0d86f9b42141212aaa6c2aa27a063c1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2965605Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Be more specific when deleting unused third_party/ dirs
3707b01f · Tim Van Patten · Angle LUCI CQ · 99a98963 · 3707b01f
Commit 3707b01f authored Jun 16, 2021 by Tim Van Patten Committed by Angle LUCI CQ Jun 16, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

roll_aosp.sh scripts/roll_aosp.sh +9 -5

No files found.
--- a/scripts/roll_aosp.sh
+++ b/scripts/roll_aosp.sh
@@ -135,11 +135,15 @@ generate_Android_bp_file
 # Delete all unsupported 3rd party dependencies. Do this after generate_Android_bp_file, so
 # it has access to all of the necessary BUILD.gn files.
 # Any 3rd party dependencies that are added to this list must have their licenses verified.
-find third_party/ -maxdepth 1 -type d ! -wholename third_party/ \
-    ! -wholename third_party/abseil-cpp \
-    ! -wholename third_party/vulkan-deps \
-    ! -wholename third_party/vulkan_memory_allocator \
-    ! -wholename third_party/zlib \
+find third_party/ -maxdepth 2 -type d ! -path third_party/ \
+    ! -path 'third_party/abseil-cpp*' \
+    ! -path 'third_party/vulkan-deps' \
+    ! -path 'third_party/vulkan-deps/glslang*' \
+    ! -path 'third_party/vulkan-deps/spirv-headers*' \
+    ! -path 'third_party/vulkan-deps/spirv-tools*' \
+    ! -path 'third_party/vulkan-deps/vulkan-headers*' \
+    ! -path 'third_party/vulkan_memory_allocator*' \
+    ! -path 'third_party/zlib*' \
    -print0 | xargs --null rm -rf

 git add Android.bp