Skip to content

A
angle
Commit f4cd1747 by Stephen White Committed by Commit Bot
Options

Reland "Changes to build inside a Dawn checkout."

This is a reland of 11c31e0a I've landed upstream Skia change https://skia-review.googlesource.com/c/skia/+/351496 which should make this safe to reland. Original change's description: > Changes to build inside a Dawn checkout. > > Add an "angle_standalone" flag that can be disabled by Dawn. > Put test definitions behind angle_standalone || build_with_chromium. > > Bug: angleproject:5462 > Change-Id: I58c9b18723384334156e2a3dd86ed3f89afcaade > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2587451 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Stephen White <senorblanco@chromium.org> Bug: angleproject:5462 Change-Id: I4ff92d45b3692312a004f03b425234b78c5a6219 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2618040 Commit-Queue: Stephen White <senorblanco@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 038ae144
Showing with 7 additions and 2 deletions
BUILD.gn
...@@ -1137,7 +1137,7 @@ angle_executable("angle_shader_translator") { ...@@ -1137,7 +1137,7 @@ angle_executable("angle_shader_translator") {
deps = [ ":translator" ] deps = [ ":translator" ]
} }
if (angle_has_build) { if (angle_standalone || build_with_chromium) {
config("angle_feature_support_config") { config("angle_feature_support_config") {
include_dirs = [ include_dirs = [
"include", "include",
......
gni/angle.gni
...@@ -101,6 +101,9 @@ declare_args() { ...@@ -101,6 +101,9 @@ declare_args() {
# worker thread pool. # worker thread pool.
angle_delegate_workers = build_with_chromium angle_delegate_workers = build_with_chromium
# True if we are building inside an ANGLE checkout.
angle_standalone = !build_with_chromium
angle_enable_d3d9 = is_win && !angle_is_winuwp angle_enable_d3d9 = is_win && !angle_is_winuwp
angle_enable_d3d11 = is_win angle_enable_d3d11 = is_win
angle_enable_gl = (ozone_platform_gbm || (!is_linux && !is_chromeos) || angle_enable_gl = (ozone_platform_gbm || (!is_linux && !is_chromeos) ||
...@@ -338,7 +341,8 @@ template("angle_static_library") { ...@@ -338,7 +341,8 @@ template("angle_static_library") {
} }
} }
template("angle_test") { if (angle_standalone || build_with_chromium) {
template("angle_test") {
test(target_name) { test(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
"*", "*",
...@@ -408,6 +412,7 @@ template("angle_test") { ...@@ -408,6 +412,7 @@ template("angle_test") {
use_raw_android_executable = true use_raw_android_executable = true
} }
} }
}
if (is_ios) { if (is_ios) {
# We use a special main function on iOS to initialize UIKit before the normal main runs. # We use a special main function on iOS to initialize UIKit before the normal main runs.
ldflags = [ ldflags = [
......
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