Pull angle-internal for internal ANGLE devs.

.gitignore

@@ -24,6 +24,7 @@
 .cipd
 .gclient
 .gclient_entries
+/angle-internal
 /src/tests/third_party/gles_conformance_tests
 /testing
 /tools/glslang/glslang_validator
@@ -52,7 +53,7 @@
 /third_party/yasm
 /third_party/zlib
 /tools/md_browser
-angle_internal
+angle_debug.txt
 build
 buildtools/
 debug.txt

DEPS

+# This file is used to manage the dependencies of the ANGLE git repo. It is
+# used by gclient to determine what version of each dependency to check out, and
+# where.
+
 vars = {
   'android_git': 'https://android.googlesource.com',
   'chromium_git': 'https://chromium.googlesource.com',
@@ -8,6 +12,10 @@ vars = {
   # This variable is overrided in Chromium's DEPS file.
   'build_with_chromium': False,
 
+  # By default, do not check out angle-internal. This can be overridden e.g. with custom_vars.
+  # We overload Chromium's 'src-internal' for infra simplicity.
+  'checkout_src_internal': False,
+
   # Current revision of dEQP.
   'deqp_revision': 'd3eef28e67ce6795ba3a2124aaa977819729d45f',
 
@@ -35,6 +43,11 @@ vars = {
 
 deps = {
 
+  '{angle_root}/angle-internal': {
+    'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@5d678a322a969284078f27052bc0961da81d30f5',
+    'condition': 'checkout_src_internal',
+  },
+
   '{angle_root}/build': {
     'url': '{chromium_git}/chromium/src/build.git@54ea0e7fd122348de2f73ac21d1b6eafb9b78969',
     'condition': 'not build_with_chromium',
@@ -326,6 +339,9 @@ hooks = [
 ]
 
 recursedeps = [
+  # angle-internal has its own DEPS file to pull additional internal repos
+  '{angle_root}/angle-internal',
+
   # buildtools provides clang_format.
   '{angle_root}/buildtools',
 ]

src/tests/BUILD.gn

@@ -331,7 +331,7 @@ if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
 ###-----------------------------------------------------
 
 if (build_angle_gles1_conform_tests) {
-  gles1_conform_root = "//third_party/gles1_conform"
+  gles1_conform_root = "$angle_root/third_party/gles1_conform"
 
   config("angle_gles1_conform_support") {
     include_dirs = [