Move angle_enable_* inside declare_args().

This allows enabling and disabling parts of the build via gn args, similar to what gyp allowed. BUG=angleproject:1569 Change-Id: Ia95c134f98f8941408df96b1d4e2563e713a9ef2 Reviewed-on: https://chromium-review.googlesource.com/838260 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Move angle_enable_* inside declare_args().
6df487ef · Frank Henigman · Commit Bot · fc3463da · 6df487ef
Commit 6df487ef authored Dec 20, 2017 by Frank Henigman Committed by Commit Bot Jan 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 30 deletions

angle.gni gni/angle.gni +14 -30

No files found.
--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -17,37 +17,21 @@ if (build_with_chromium) {
  }
 }

-angle_enable_d3d9 = false
-angle_enable_d3d11 = false
-angle_enable_gl = false
-angle_enable_gl_null = false
-angle_enable_vulkan = false
-angle_enable_null = true
-
-if (is_win) {
-  angle_enable_d3d9 = true
-  angle_enable_d3d11 = true
-  angle_enable_gl = true
-  angle_enable_gl_null = true
-  angle_enable_vulkan = true
-
-  import("//build/config/win/visual_studio_version.gni")
-} else if (is_linux && use_x11 && !is_chromeos) {
-  angle_enable_gl = true
-  angle_enable_gl_null = true
-  angle_enable_vulkan = true
-} else if (is_mac || ozone_platform_gbm) {
-  angle_enable_gl = true
-  angle_enable_gl_null = true
-} else if (is_android) {
-  angle_enable_gl = true
-  angle_enable_gl_null = true
+declare_args() {
+  angle_enable_d3d9 = is_win
+  angle_enable_d3d11 = is_win
+  angle_enable_gl = ozone_platform_gbm || !is_linux || (use_x11 && !is_chromeos)
+  angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos)
+  angle_enable_null = true
+  angle_enable_essl = true
+  angle_enable_glsl = true
 }

-angle_enable_essl = true
-angle_enable_glsl = true
-angle_enable_hlsl = false
+declare_args() {
+  angle_enable_gl_null = angle_enable_gl
+  angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11
+}

-if (angle_enable_d3d9 || angle_enable_d3d11) {
-  angle_enable_hlsl = true
+if (is_win) {
+  import("//build/config/win/visual_studio_version.gni")
 }