From 3da82338d1a6f81fd9501366f855f90cf91952ef Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Thu, 25 Oct 2018 17:02:50 -0700
Subject: [PATCH] build(bazel): turn on --nolegacy-external-runfiles (#26770)

PR Close #26770
---
 .bazelrc                                             | 4 ++++
 packages/bazel/test/ngc-wrapped/tsconfig_template.ts | 2 +-
 packages/compiler-cli/test/test_support.ts           | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index e744c12372..a17edc0baf 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -24,6 +24,10 @@ build --symlink_prefix=/
 # Performance: avoid stat'ing input files
 build --watchfs
 
+# Turn off legacy external runfiles
+run --nolegacy_external_runfiles
+test --nolegacy_external_runfiles
+
 ###############################
 # Release support             #
 ###############################
diff --git a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
index 2aa54a9b92..77d408e107 100644
--- a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
+++ b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
@@ -70,7 +70,7 @@ export function createTsConfig(options: TsConfigOptions) {
       'tsickleExternsPath': '',
       // we don't copy the node_modules into our tmp dir, so we should look in
       // the original workspace directory for it
-      'nodeModulesPrefix': '../angular/external/ngdeps/node_modules',
+      'nodeModulesPrefix': '../ngdeps/node_modules',
     },
     'files': options.files,
     'angularCompilerOptions': {
diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts
index 07256837fc..bfcefb60db 100644
--- a/packages/compiler-cli/test/test_support.ts
+++ b/packages/compiler-cli/test/test_support.ts
@@ -136,7 +136,7 @@ export function setupBazelTo(basePath: string) {
   }
 
   // Link typescript
-  const typescriptSource = path.join(sources, 'angular/external/ngdeps/node_modules/typescript');
+  const typescriptSource = path.join(sources, 'ngdeps/node_modules/typescript');
   const typescriptDest = path.join(nodeModulesPath, 'typescript');
   if (fs.existsSync(typescriptSource)) {
     fs.symlinkSync(typescriptSource, typescriptDest);