Skip to content

Commit 55f2e47

Browse files
thomasvlswiple-rules-gardener
authored andcommitted
Remove support for the old name for the C/ObjC layering check.
PiperOrigin-RevId: 749787905
1 parent d1736bf commit 55f2e47

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

swift/internal/feature_names.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ SWIFT_FEATURE_MODULAR_INDEXING = "swift.modular_indexing"
9494
# If enabled, when compiling an explicit C or Objectve-C module, every header
9595
# included by the module being compiled must belong to one of the modules listed
9696
# in its dependencies. This is ignored for system modules.
97-
SWIFT_FEATURE_LAYERING_CHECK = "swift.layering_check"
9897
SWIFT_FEATURE_LAYERING_CHECK_FOR_C_DEPS = "swift.layering_check_for_c_deps"
9998

10099
# If enabled, an error will be emitted when compiling Swift code if it imports

swift/toolchains/config/compile_config.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ load(
5151
"SWIFT_FEATURE_INDEX_SYSTEM_MODULES",
5252
"SWIFT_FEATURE_INDEX_WHILE_BUILDING",
5353
"SWIFT_FEATURE_INTERNALIZE_AT_LINK",
54-
"SWIFT_FEATURE_LAYERING_CHECK",
5554
"SWIFT_FEATURE_LAYERING_CHECK_FOR_C_DEPS",
5655
"SWIFT_FEATURE_LAYERING_CHECK_SWIFT",
5756
"SWIFT_FEATURE_MODULAR_INDEXING",
@@ -556,8 +555,7 @@ def compile_action_configs(
556555
ActionConfigInfo(
557556
actions = [SWIFT_ACTION_PRECOMPILE_C_MODULE],
558557
configurators = [_c_layering_check_configurator],
559-
# We require both so turning off either during the migration will disable this.
560-
features = [SWIFT_FEATURE_LAYERING_CHECK, SWIFT_FEATURE_LAYERING_CHECK_FOR_C_DEPS],
558+
features = [SWIFT_FEATURE_LAYERING_CHECK_FOR_C_DEPS],
561559
not_features = [SWIFT_FEATURE_SYSTEM_MODULE],
562560
),
563561
ActionConfigInfo(

0 commit comments

Comments
 (0)