godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-06 02:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow ANGLE to be compiled as ARC

Browse Source 
Chromium is switching to compilation with ARC. While there are
remnants of ARC dual-compilation, ANGLE isn't ready for that, so don't
allow it to be compiled with ARC.

Bug: chromium:733237, angleproject:8267
Change-Id: If5c8d5ab039fb44e10102df616e72dbcfd55ac70
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4698494
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
Avi Drissman
2023-07-14 13:31:06 -04:00
committed by Angle LUCI CQ
parent 8138ae9b1f
commit f2e0f8a0b2
1 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
gni/angle.gni
View File

@@ -416,6 +416,20 @@ template("angle_shared_library") {
configs += invoker.configs
configs -= invoker.suppressed_configs
if (is_apple) {
# If a "build with ARC" config is present, remove it.
# TODO(https://crbug.com/1280317): Remove the "enable_arc2" variant
# when ARC migration in the Chromium repo is complete.
if (filter_include(configs, [ "//build/config/compiler:enable_arc" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
if (filter_include(configs, [ "//build/config/compiler:enable_arc2" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc2" ]
}
}
public_configs += [ angle_root + ":shared_library_public_config" ]
if (is_android) {
@@ -460,6 +474,20 @@ template("angle_source_set") {
configs += invoker.configs
configs -= invoker.suppressed_configs
if (is_apple) {
# If a "build with ARC" config is present, remove it.
# TODO(https://crbug.com/1280317): Remove the "enable_arc2" variant
# when ARC migration in the Chromium repo is complete.
if (filter_include(configs, [ "//build/config/compiler:enable_arc" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
if (filter_include(configs, [ "//build/config/compiler:enable_arc2" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc2" ]
}
}
}
}
@@ -478,6 +506,20 @@ template("angle_static_library") {
configs += invoker.configs
configs -= invoker.suppressed_configs
if (is_apple) {
# If a "build with ARC" config is present, remove it.
# TODO(https://crbug.com/1280317): Remove the "enable_arc2" variant
# when ARC migration in the Chromium repo is complete.
if (filter_include(configs, [ "//build/config/compiler:enable_arc" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
if (filter_include(configs, [ "//build/config/compiler:enable_arc2" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc2" ]
}
}
}
}
@@ -495,6 +537,20 @@ if (angle_standalone || build_with_chromium) {
configs += invoker.configs
configs -= invoker.suppressed_configs
if (is_apple) {
# If a "build with ARC" config is present, remove it.
# TODO(https://crbug.com/1280317): Remove the "enable_arc2" variant
# when ARC migration in the Chromium repo is complete.
if (filter_include(configs, [ "//build/config/compiler:enable_arc" ]) !=
[]) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
if (filter_include(configs,
[ "//build/config/compiler:enable_arc2" ]) != []) {
configs -= [ "//build/config/compiler:enable_arc2" ]
}
}
if (is_ios) {
# shared libraries are hidden inside ios_framework_bundle, but we include headers from them
check_includes = false