Revert "[build] Handle subdirectory BUILD files (#30292)" (#30319)

This reverts commit 7e50d149bc.

test/core/uri/BUILD

@@ -24,14 +24,11 @@ grpc_fuzzer(
     srcs = ["uri_fuzzer_test.cc"],
     corpus = "uri_corpus",
     language = "C++",
-    tags = [
-        "no_windows",
-    ],
+    tags = ["no_windows"],
     deps = [
-        "//:exec_ctx",
-        "//:gpr_base",
-        "//:grpc_trace",
-        "//:uri_parser",
+        "//:gpr",
+        "//:grpc",
+        "//test/core/util:grpc_test_util",
     ],
 )
 
@@ -40,7 +37,6 @@ grpc_cc_test(
     srcs = ["uri_parser_test.cc"],
     external_deps = ["gtest"],
     language = "C++",
-    tags = ["nofixdeps"],
     deps = [
         "//:grpc",
         "//test/core/util:grpc_test_util",

tools/distrib/fix_build_deps.py

@@ -246,7 +246,6 @@ class FakeSelects:
 
 num_cc_libraries = 0
 num_opted_out_cc_libraries = 0
-parsing_path = None
 
 
 def grpc_cc_library(name,
@@ -261,9 +260,6 @@ def grpc_cc_library(name,
     global args
     global num_cc_libraries
     global num_opted_out_cc_libraries
-    global parsing_path
-    assert (parsing_path is not None)
-    name = '//%s:%s' % (parsing_path, name)
     num_cc_libraries += 1
     if select_deps or 'nofixdeps' in tags:
         if args.whats_left and not select_deps and 'nofixdeps' not in tags:
@@ -284,15 +280,14 @@ def grpc_cc_library(name,
     original_deps[name] = frozenset(deps)
     original_external_deps[name] = frozenset(external_deps)
     for src in hdrs + public_hdrs + srcs:
-        for line in open('%s%s' %
-                         ((parsing_path + '/' if parsing_path else ''), src)):
+        for line in open(src):
             m = re.search(r'#include <(.*)>', line)
             if m:
                 inc.add(m.group(1))
             m = re.search(r'#include "(.*)"', line)
             if m:
                 inc.add(m.group(1))
-            if 'grpc::g_glip' in line or 'grpc::g_core_codegen_interface' in line:
+            if 'grpc::g_glip' in line or 'grpc:g_core_codegen_interface' in line:
                 needs_codegen_base_src.add(name)
     consumes[name] = list(inc)
 
@@ -365,10 +360,8 @@ parser.add_argument('--whats_left',
                     help='show what is left to opt in')
 args = parser.parse_args()
 
-for dirname in ["", "test/core/uri"]:
-    parsing_path = dirname
 exec(
-        open('%sBUILD' % (dirname + '/' if dirname else ''), 'r').read(), {
+    open('BUILD', 'r').read(), {
         'load': lambda filename, *args: None,
         'licenses': lambda licenses: None,
         'package': lambda **kwargs: None,
@@ -377,30 +370,12 @@ for dirname in ["", "test/core/uri"]:
         'selects': FakeSelects(),
         'python_config_settings': lambda **kwargs: None,
         'grpc_cc_library': grpc_cc_library,
-            'grpc_cc_test': grpc_cc_library,
-            'grpc_fuzzer': grpc_cc_library,
         'select': lambda d: d["//conditions:default"],
         'grpc_upb_proto_library': lambda name, **kwargs: None,
         'grpc_upb_proto_reflection_library': lambda name, **kwargs: None,
         'grpc_generate_one_off_targets': lambda: None,
-            'grpc_package': lambda **kwargs: None,
         'filegroup': lambda name, **kwargs: None,
     }, {})
-    parsing_path = None
-
-if args.whats_left:
-    print("{}/{} libraries are opted in".format(
-        num_cc_libraries - num_opted_out_cc_libraries, num_cc_libraries))
-
-
-def make_relative_path(dep, lib):
-    if lib is None:
-        return dep
-    lib_path = lib[:lib.rfind(':') + 1]
-    if dep.startswith(lib_path):
-        return dep[len(lib_path):]
-    return dep
-
 
 if args.whats_left:
     print("{}/{} libraries are opted in".format(
@@ -411,23 +386,20 @@ if args.whats_left:
 # problem. (models the list monad in Haskell!)
 class Choices:
 
-    def __init__(self, library):
-        self.library = library
+    def __init__(self):
         self.to_add = []
         self.to_remove = []
 
     def add_one_of(self, choices):
         if not choices:
             return
-        self.to_add.append(
-            tuple(
-                make_relative_path(choice, self.library) for choice in choices))
+        self.to_add.append(tuple(choices))
 
     def add(self, choice):
         self.add_one_of([choice])
 
     def remove(self, remove):
-        self.to_remove.append(make_relative_path(remove, self.library))
+        self.to_remove.append(remove)
 
     def best(self, scorer):
         choices = set()
@@ -456,8 +428,8 @@ class Choices:
 def make_library(library):
     error = False
     hdrs = sorted(consumes[library])
-    deps = Choices(library)
-    external_deps = Choices(None)
+    deps = Choices()
+    external_deps = Choices()
     for hdr in hdrs:
         if hdr == 'src/core/lib/profiling/stap_probes.h':
             continue
@@ -555,8 +527,9 @@ for library, lib_error, deps, external_deps in updated_libraries:
     if lib_error:
         error = True
         continue
-    buildozer_set_list('external_deps', external_deps, library, via='deps')
-    buildozer_set_list('deps', deps, library)
+    target = ':' + library
+    buildozer_set_list('external_deps', external_deps, target, via='deps')
+    buildozer_set_list('deps', deps, target)
 
 if buildozer_commands:
     ok_statuses = (0, 3)