Remove "enable_arc2" from Dawn
"enable_arc2" was a temporary config in Chromium. Now that it's
removed (https://crrev.com/c/4727002), remove references to it
from Dawn.
Bug: chromium:1280317
Change-Id: I9ec696ae6012874ce944ad016d9a97e198bc61a5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/143831
Auto-Submit: Avi Drissman <avi@google.com>
Kokoro: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
diff --git a/scripts/dawn_component.gni b/scripts/dawn_component.gni
index 5fcc15a..2c9e1d4 100644
--- a/scripts/dawn_component.gni
+++ b/scripts/dawn_component.gni
@@ -90,16 +90,10 @@
}
# 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" ]
- }
# Tell dependents where to find this shared library
if (is_mac) {
@@ -142,16 +136,10 @@
}
# 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" ]
- }
}
group(name) {
diff --git a/src/dawn/glfw/BUILD.gn b/src/dawn/glfw/BUILD.gn
index 1bc788c..dd4d360 100644
--- a/src/dawn/glfw/BUILD.gn
+++ b/src/dawn/glfw/BUILD.gn
@@ -40,16 +40,10 @@
]
# 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_deps = [
diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 1a5d683..2f80783 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -616,16 +616,10 @@
]
# 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 (dawn_enable_null) {
diff --git a/src/dawn/tests/BUILD.gn b/src/dawn/tests/BUILD.gn
index fca9fc3..df65dfd 100644
--- a/src/dawn/tests/BUILD.gn
+++ b/src/dawn/tests/BUILD.gn
@@ -701,16 +701,10 @@
]
# 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 (dawn_enable_opengles) {
diff --git a/src/dawn/utils/BUILD.gn b/src/dawn/utils/BUILD.gn
index 5c28981..f71d109 100644
--- a/src/dawn/utils/BUILD.gn
+++ b/src/dawn/utils/BUILD.gn
@@ -76,16 +76,10 @@
frameworks += [ "QuartzCore.framework" ]
# 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" ]
- }
} else {
sources += [ "PosixTimer.cpp" ]
}
diff --git a/third_party/gn/glfw/BUILD.gn b/third_party/gn/glfw/BUILD.gn
index e45f65d..bfc1f97 100644
--- a/third_party/gn/glfw/BUILD.gn
+++ b/third_party/gn/glfw/BUILD.gn
@@ -158,16 +158,10 @@
]
# 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" ]
- }
frameworks = [
"Cocoa.framework",
