| Index: components/cronet/android/BUILD.gn
|
| diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
|
| index 725024e297a43e8c5c7280cbae71ad33bd4c765f..eb787c88cef589d3fc0c9815c7a8dab82aede17a 100644
|
| --- a/components/cronet/android/BUILD.gn
|
| +++ b/components/cronet/android/BUILD.gn
|
| @@ -1109,9 +1109,11 @@ if (target_cpu == "arm" && arm_version == 7 && !arm_use_neon) {
|
| }
|
|
|
| group("cronet_package") {
|
| + # Enforce building with ICU alternatives, crbug.com/611621.
|
| # Enforce that arm_use_neon==false when building for ARMv7 by
|
| # not including any deps in cronet_package target otherwise.
|
| - if (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon) {
|
| + if (use_platform_icu_alternatives &&
|
| + (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon)) {
|
| deps = [
|
| ":cronet_package_copy",
|
| ":cronet_package_copy_native_lib",
|
|
|