Fixes and updates to roll_aosp.sh

1.) Remove unused zlib contrib/ directories - There are missing licenses in third_party/zlib/contrib/, so remove the unused directories from the AOSP checkin. 2.) `git add` all third_party/ changes - All of the unused third_party/ changes have been manually merged, so we can now automatically add any changes to third_party/. Bug: b/191882454 Bug: b/187342779 Change-Id: If209ff3bb34ad53c08f431a06a2f84d153181e45 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2992578Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Fixes and updates to roll_aosp.sh
0b5f268a · Tim Van Patten · Angle LUCI CQ · a25f0f2c · 0b5f268a
Commit 0b5f268a authored Jun 28, 2021 by Tim Van Patten Committed by Angle LUCI CQ Jun 28, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

roll_aosp.sh scripts/roll_aosp.sh +7 -3

No files found.
--- a/scripts/roll_aosp.sh
+++ b/scripts/roll_aosp.sh
@@ -148,6 +148,11 @@ find third_party/ -maxdepth 2 -type d ! -path third_party/ \
    ! -path 'third_party/vulkan_memory_allocator*' \
    ! -path 'third_party/zlib*' \
    -print0 | xargs --null rm -rf
+# Special handling for zlib's contrib/ (third_party) folder, since there are some
+# missing license files.
+find third_party/zlib/contrib/ -maxdepth 1 -type d ! -path third_party/zlib/contrib/ \
+    ! -path 'third_party/zlib/contrib/optimizations*' \
+    -print0 | xargs --null rm -rf
 git add Android.bp
@@ -173,9 +178,8 @@ for removal_file in "${extra_removal_files[@]}"; do
   rm -f "$removal_file"
 done
-for dep in "${third_party_deps[@]}"; do
+# Add all changes to third_party/ so we delete everything not explicitly allowed.
-   git add -f "$dep"
+git add -f "third_party/*"
-done
 # Done with depot_tools
 rm -rf $DEPOT_TOOLS_DIR