From 3d1f22a79b03f4ad094ed7b9ca41b7005655eaab Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Tue, 13 Feb 2024 10:03:56 +0000 Subject: [PATCH] Revert "Roll zlib to 646b7f569718921d7d4b5b8e22572ff6c76f2596." This reverts commit 2f90c9c8ce57fa94845516bd7865cac5e8949c0a. Reason for revert: Build failures for Android. ``` ERROR at //third_party/zlib/BUILD.gn:349:17: Can't load input file. deps += [ "//third_party/cpu_features:ndk_compat" ] ``` Original change's description: > Roll zlib to 646b7f569718921d7d4b5b8e22572ff6c76f2596. > > Change-Id: I5c222fbacce6e89226d450534c7f9400cb6d2164 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352044 > Commit-Queue: Ryan Macnak > Reviewed-by: Brian Quinlan Change-Id: I38f345e7576d8a166518ed37a9f32f249e6ca1a8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352221 Reviewed-by: Martin Kustermann Bot-Commit: Rubber Stamper Commit-Queue: Daco Harkes --- DEPS | 2 +- build/config/dcheck_always_on.gni | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 build/config/dcheck_always_on.gni diff --git a/DEPS b/DEPS index 35ad5217729..c2c73f092d2 100644 --- a/DEPS +++ b/DEPS @@ -111,7 +111,7 @@ vars = { "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93", "protobuf_gn_rev": "ca669f79945418f6229e4fef89b666b2a88cbb10", "WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c", - "zlib_rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596", + "zlib_rev": "14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f", ### /third_party/pkg dependencies # 'tools/rev_sdk_deps.dart' can rev pkg dependencies to their latest; put an diff --git a/build/config/dcheck_always_on.gni b/build/config/dcheck_always_on.gni deleted file mode 100644 index 805c015b97a..00000000000 --- a/build/config/dcheck_always_on.gni +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2016 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Compatiblity with Chromium's build for zlib. -dcheck_is_configurable = false -dcheck_always_on = false -enable_expensive_dchecks = false