Revert "Changes to build inside a Dawn checkout."

This reverts commit 11c31e0a. Reason for revert: Broke ANGLE -> Skia roll because of GN error. Bug: angleproject:5489 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> TBR=senorblanco@chromium.org,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: angleproject:5462 Change-Id: I4363d1d35b03e00d970e25ddd3d7eac51ad2da2d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2600078Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Revert "Changes to build inside a Dawn checkout."
c500ee03 · Jamie Madill · Commit Bot · d447829c · c500ee03 · c500ee03
Commit c500ee03 authored Dec 23, 2020 by Jamie Madill Committed by Commit Bot Dec 23, 2020
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

BUILD.gn BUILD.gn +1 -1

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

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1118,7 +1118,7 @@ angle_executable("angle_shader_translator") {
  deps = [ ":translator" ]
 }
-if (angle_standalone || build_with_chromium) {
+if (angle_has_build) {
  config("angle_feature_support_config") {
    include_dirs = [
      "include",

--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -101,9 +101,6 @@ 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) ||
@@ -313,8 +310,7 @@ template("angle_static_library") {
  }
 }
-if (angle_standalone || build_with_chromium) {
+template("angle_test") {
-  template("angle_test") {
  test(target_name) {
    forward_variables_from(invoker,
                           "*",
@@ -385,5 +381,4 @@ if (angle_standalone || build_with_chromium) {
      }
    }
  }
-  }
 }