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/+/2587451Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Stephen White <senorblanco@chromium.org>

Changes to build inside a Dawn checkout.
11c31e0a · Stephen White · Commit Bot · 0c5a55a5 · 11c31e0a · 11c31e0a
Commit 11c31e0a authored Dec 21, 2020 by Stephen White Committed by Commit Bot Dec 21, 2020
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

BUILD.gn BUILD.gn +1 -1

angle.gni gni/angle.gni +6 -1

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1118,7 +1118,7 @@ angle_executable("angle_shader_translator") {
  deps = [ ":translator" ]
 }

-if (angle_has_build) {
+if (angle_standalone || build_with_chromium) {
  config("angle_feature_support_config") {
    include_dirs = [
      "include",

--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -101,6 +101,9 @@ declare_args() {
  # worker thread pool.
  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_d3d11 = is_win
  angle_enable_gl = (ozone_platform_gbm || (!is_linux && !is_chromeos) ||
@@ -310,7 +313,8 @@ template("angle_static_library") {
  }
 }

-template("angle_test") {
+if (angle_standalone || build_with_chromium) {
+  template("angle_test") {
    test(target_name) {
      forward_variables_from(invoker,
                             "*",
@@ -381,4 +385,5 @@ template("angle_test") {
        }
      }
    }
+  }
 }