gn: Minor improvements.

BUILD.gn

@@ -31,18 +31,19 @@ declare_args() {
 
   # Don't build extra (test, samples etc) for Windows UWP. We don't have
   # infrastructure (e.g. windowing helper functions) in place to run them.
-  angle_build_all = !angle_is_winuwp && angle_has_build
+  angle_build_all = !build_with_chromium && !angle_is_winuwp && angle_has_build
 }
 
-if (!build_with_chromium && angle_build_all) {
+if (angle_build_all) {
   group("all") {
     testonly = true
     deps = [
+      ":angle",
       ":angle_shader_translator",
       ":translator_fuzzer",
       ":xxhash_fuzzer",
-      "//samples:all",
-      "//src/tests:all",
+      "$angle_root/samples:angle_samples",
+      "$angle_root/src/tests:angle_tests",
     ]
   }
 }
@@ -1181,7 +1182,6 @@ foreach(is_shared_library,
 
 # Convenience targets for some of the samples so they can be built
 # with Chromium's toolchain.
-
 angle_executable("angle_shader_translator") {
   testonly = true
 
@@ -1302,9 +1302,9 @@ if (build_with_chromium && !is_component_build && is_android &&
   }
 }
 
-# Note: libGLESv1_CM is not presently included because most Chrome users don't care about it.
 group("angle") {
   data_deps = [
+    ":libGLESv1_CM",
     ":libGLESv2",
     ":libEGL",
   ]

samples/BUILD.gn

@@ -12,16 +12,6 @@ declare_args() {
   angle_capture_replay_sample_context_id = 1
 }
 
-angle_executable("shader_translator") {
-  sources = [
-    "shader_translator/shader_translator.cpp",
-  ]
-  include_dirs = [ "../include" ]
-  deps = [
-    "../:translator",
-  ]
-}
-
 config("sample_util_config") {
   include_dirs = [ "sample_util" ]
 }
@@ -255,7 +245,7 @@ if (angle_build_capture_replay_sample) {
   }
 }
 
-group("all") {
+group("angle_samples") {
   testonly = true
   deps = [
     ":gles1_draw_texture",

src/tests/BUILD.gn

@@ -13,38 +13,6 @@ declare_args() {
   build_angle_gles1_conform_tests = false
 }
 
-if (!build_with_chromium) {
-  group("all") {
-    testonly = true
-    deps = [
-      "//src/tests:angle_end2end_tests",
-      "//src/tests:angle_perftests",
-      "//src/tests:angle_unittests",
-    ]
-    if (!is_fuchsia) {
-      deps += [
-        "//src/tests:angle_white_box_perftests",
-        "//src/tests:angle_white_box_tests",
-      ]
-    }
-    if (build_angle_deqp_tests && !is_fuchsia) {
-      deps += [
-        "//src/tests:angle_deqp_egl_no_gtest",
-        "//src/tests:angle_deqp_egl_tests",
-        "//src/tests:angle_deqp_gles2_no_gtest",
-        "//src/tests:angle_deqp_gles2_tests",
-        "//src/tests:angle_deqp_gles31_no_gtest",
-        "//src/tests:angle_deqp_gles31_tests",
-        "//src/tests:angle_deqp_gles3_no_gtest",
-        "//src/tests:angle_deqp_gles3_tests",
-      ]
-    }
-    if (build_angle_gles1_conform_tests) {
-      deps += [ "//src/tests:angle_gles1_conformance_tests" ]
-    }
-  }
-}
-
 angle_executable("test_utils_unittest_helper") {
   sources = test_utils_unittest_helper_sources
 
@@ -1005,3 +973,37 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     mustpass_name = "gles31-khr-master.txt"
   }
 }
+
+group("angle_tests") {
+  testonly = true
+  deps = [
+    ":angle_end2end_tests",
+    ":angle_perftests",
+    ":angle_unittests",
+  ]
+  if (!is_fuchsia) {
+    deps += [
+      ":angle_white_box_perftests",
+      ":angle_white_box_tests",
+    ]
+  }
+  if (build_angle_deqp_tests && !is_fuchsia) {
+    deps += [
+      ":angle_deqp_egl_tests",
+      ":angle_deqp_gles2_tests",
+      ":angle_deqp_gles31_tests",
+      ":angle_deqp_gles3_tests",
+    ]
+    if (!build_with_chromium) {
+      deps += [
+        ":angle_deqp_egl_no_gtest",
+        ":angle_deqp_gles2_no_gtest",
+        ":angle_deqp_gles31_no_gtest",
+        ":angle_deqp_gles3_no_gtest",
+      ]
+    }
+  }
+  if (build_angle_gles1_conform_tests) {
+    deps += [ ":angle_gles1_conformance_tests" ]
+  }
+}