From 24b5d0c67c6e08c207560d52a502469ca542714f Mon Sep 17 00:00:00 2001
From: Chris Parsons <cparsons@google.com>
Date: Wed, 27 Feb 2019 17:34:04 -0500
Subject: [PATCH] add incompatible_remap_main_repo to buildkite build flags

---
 .bazelci/presubmit.yml | 16 ++++++++++++++++
 docs/BUILD             |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index bd50460..6bdf62c 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -6,6 +6,8 @@ tasks:
     bazel: latest
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -17,6 +19,8 @@ tasks:
     bazel: latest
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -28,6 +32,8 @@ tasks:
     bazel: latest
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -39,6 +45,8 @@ tasks:
     bazel: latest
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "--"
     - "..."
@@ -52,6 +60,8 @@ tasks:
     bazel: last_green
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -63,6 +73,8 @@ tasks:
     bazel: last_green
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -74,6 +86,8 @@ tasks:
     bazel: last_green
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "..."
     test_flags:
@@ -85,6 +99,8 @@ tasks:
     bazel: last_green
     build_targets:
     - "..."
+    build_flags:
+    - "--incompatible_remap_main_repo"
     test_targets:
     - "--"
     - "..."
diff --git a/docs/BUILD b/docs/BUILD
index 748ddbe..865db0b 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -1,7 +1,7 @@
 load("@io_bazel_skydoc//stardoc:stardoc.bzl", "stardoc")
 
 # Note that due to a bug in Bazel 0.22.0, these targets cannot be built without
-# the --experimental_remap_main_repo flag.
+# the --incompatible_remap_main_repo flag.
 stardoc(
     name = "build_test_docs",
     input = "//rules:build_test.bzl",