Commit 0642582a authored by Ben Mason's avatar Ben Mason Committed by Chromium LUCI CQ

Revert "Not link ANGLE statically on Android for stable and beta channels"

This reverts commit 2a3f2a4e.

Reason for revert: Suspected build failure: crbug.com/1163418

Original change's description:
> Not link ANGLE statically on Android for stable and beta channels
>
> Bug: 1161513
> Change-Id: Ia0a82f44b878dbcb7589a2aec9ec597ff517660b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600390
> Reviewed-by: Zhenyao Mo <zmo@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Peng Huang <penghuang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#840191}

TBR=penghuang@chromium.org,zmo@chromium.org,kbr@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: If804b48a0b27fe6873fcdeafa3ca7530027348a0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1161513
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2610922Reviewed-by: default avatarBen Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840593}
parent 81b5c87e
......@@ -2,16 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/android/channel.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/chromeos/ui_mode.gni")
declare_args() {
# Should ANGLE be linked statically?
# Enabling currently supported only on Android.
use_static_angle =
is_android && android_channel != "stable" && android_channel != "beta"
# False by default, enabling currently supported only on Android
use_static_angle = is_android
# Should EGL support be compiled?
# Can be overriden to test during bring up of EGL support on other platforms.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment