Revert "Stop rolling third_party/cpu_features"

This reverts commit da710ac3f7

Reason for revert: Causes Android roll to fail
http://anglebug.com/8255

Original change's description:
> Stop rolling third_party/cpu_features
>
> It was probably needed for zlib previously but now zlib already depends
> on the ndk's cpufeatures. There are no references to third_party
> cpu_features in the generated Android.bp.
>
> Bug: b/289259681
> Change-Id: Ib849b26391d0c23e533662094e74384c267c8620
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4656761
> Reviewed-by: Solti Ho <solti@google.com>
> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
> Auto-Submit: Roman Lavrov <romanl@google.com>
> Commit-Queue: Solti Ho <solti@google.com>

Test: scripts/roll_aosp.sh
Bug: angleproject:8255
Change-Id: I2a879a3675a1c041a0e6ffff2be886aa693e486d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4680107
Reviewed-by: Solti Ho <solti@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>
This commit is contained in:
Cody Northrop
2023-07-12 11:08:25 -06:00
committed by Angle LUCI CQ
parent 75e647193a
commit c93682d3dc

View File

@@ -130,7 +130,6 @@ root_add_deps=(
delete_only_deps=(
"third_party/vulkan-deps"
"third_party/zlib" # Replaced by Android's zlib; delete for gclient to work https://crbug.com/skia/14155#c3
"third_party/cpu_features" # Replaced by Android's cpufeatures; same as zlib above
)
# Delete dep directories so that gclient can check them out
@@ -159,7 +158,6 @@ unsupported_third_party_deps=(
"third_party/android_sdk"
"third_party/android_toolchain"
"third_party/zlib" # Replaced by Android's zlib
"third_party/cpu_features" # Replaced by Android's cpufeatures
)
for unsupported_third_party_dep in "${unsupported_third_party_deps[@]}"; do
rm -rf "$unsupported_third_party_dep"