commit b65eb1e952ffa70dee6f9d91b9d44eec2112ed42
author laszlocsomor <laszlocsomor@google.com> Mon Apr 30 05:02:37 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Apr 30 05:03:58 2018 -0700
tree c110e40dc9f10cc6d81f3b9262a0d5be636ed78d
parent 819bf38d97e6eef3c823bdae3ffcdb013d6d83e3

Fix targets broken by https://github.com/bazelbuild/bazel/commit/819bf38d97e6eef3c823bdae3ffcdb013d6d83e3.

RELNOTES: none
PiperOrigin-RevId: 194770938

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index 140d719..04e7710 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -24,6 +24,7 @@
         "//tools/platforms:srcs",
         "//tools/genrule:srcs",
         "//tools/cpp:srcs",
+        "//tools/cpp/runfiles:srcs",
         "//tools/j2objc:srcs",
         "//tools/objc:srcs",
         "//tools/osx:srcs",
@@ -49,7 +50,8 @@
         "//tools/build_rules:embedded_tools_srcs",
         "//tools/buildstamp:srcs",
         "//tools/coverage:srcs",
-        "//tools/cpp:embedded_tools",
+        "//tools/cpp:srcs",
+        "//tools/cpp/runfiles:embedded_tools",
         "//tools/genrule:srcs",
         "//tools/j2objc:srcs",
         "//tools/jdk:package-srcs",

tools/cpp/BUILD

diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index baed014..57007d32 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -360,17 +360,7 @@
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]) + [
-        "//tools/cpp/runfiles:srcs",
-    ],
-)
-
-filegroup(
-    name = "embedded_tools",
-    srcs = glob(["**"]) + [
-        "//tools/cpp/runfiles:embedded_tools",
-    ],
-    visibility = ["//tools:__pkg__"],
+    srcs = glob(["**"]),
 )
 
 filegroup(

tools/cpp/runfiles/BUILD

diff --git a/tools/cpp/runfiles/BUILD b/tools/cpp/runfiles/BUILD
index 9afbd01..a8f47b9 100644
--- a/tools/cpp/runfiles/BUILD
+++ b/tools/cpp/runfiles/BUILD
@@ -9,7 +9,7 @@
             "*~",
         ],
     ),
-    visibility = ["//tools/cpp:__pkg__"],
+    visibility = ["//tools:__pkg__"],
 )
 
 filegroup(
@@ -18,7 +18,7 @@
         "BUILD.tools",
         "runfiles.cc",
     ],
-    visibility = ["//tools/cpp:__pkg__"],
+    visibility = ["//tools:__pkg__"],
 )
 
 cc_library(