Skip to content

Commit b2b53db

Browse files
KapJIfacebook-github-bot
authored andcommitted
executorch/runtime_wrapper: replace fbcode.build_mode_test_label with selects (#7201)
Summary: Replace `read_config` with selects. Reviewed By: larryliu0820 Differential Revision: D66308699
1 parent cd306d3 commit b2b53db

File tree

1 file changed

+18
-30
lines changed

1 file changed

+18
-30
lines changed

shim/xplat/executorch/build/runtime_wrapper.bzl

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -85,38 +85,26 @@ def _patch_build_mode_flags(kwargs):
8585
Returns:
8686
The possibly-modified `kwargs` parameter for chaining.
8787
"""
88-
build_mode = native.read_config("fbcode", "build_mode_test_label", "")
89-
flags = []
90-
91-
# Base build modes.
92-
if build_mode.startswith("dev"):
93-
flags.append("-D__ET_BUILD_MODE_DEV=1")
94-
elif build_mode.startswith("opt"):
95-
flags.append("-D__ET_BUILD_MODE_OPT=1")
96-
elif build_mode.startswith("dbgo"):
97-
flags.append("-D__ET_BUILD_MODE_DBGO=1")
98-
elif build_mode.startswith("dbg"):
99-
flags.append("-D__ET_BUILD_MODE_DBG=1")
100-
101-
# Build mode extensions.
102-
if "-cov" in build_mode:
103-
flags.append("-D__ET_BUILD_MODE_COV=1")
104-
elif "-asan" in build_mode:
105-
flags.append("-D__ET_BUILD_MODE_ASAN=1")
106-
elif "-tsan" in build_mode:
107-
flags.append("-D__ET_BUILD_MODE_TSAN=1")
108-
elif "-ubsan" in build_mode:
109-
flags.append("-D__ET_BUILD_MODE_UBSAN=1")
110-
elif "-lto" in build_mode:
111-
flags.append("-D__ET_BUILD_MODE_LTO=1")
112-
11388
if "compiler_flags" not in kwargs:
11489
kwargs["compiler_flags"] = []
11590

11691
# kwargs["compiler_flags"].extend(flags) or kwargs["compiler_flags"] += would
11792
# fail if kwargs["compiler_flags"] is Immutable (ex: the default argument of
11893
# a Buck macro)
119-
kwargs["compiler_flags"] = kwargs["compiler_flags"] + flags
94+
kwargs["compiler_flags"] = kwargs["compiler_flags"] + select({
95+
"DEFAULT": [],
96+
"ovr_config//build_mode:dbg": ["-D__ET_BUILD_MODE_DBG=1"], # @oss-disable
97+
"ovr_config//build_mode:dbgo": ["-D__ET_BUILD_MODE_DBGO=1"], # @oss-disable
98+
"ovr_config//build_mode:dev": ["-D__ET_BUILD_MODE_DEV=1"], # @oss-disable
99+
"ovr_config//build_mode:opt": ["-D__ET_BUILD_MODE_OPT=1"], # @oss-disable
100+
}) + select({
101+
"DEFAULT": [],
102+
"ovr_config//build_mode:asan": ["-D__ET_BUILD_MODE_ASAN=1"], # @oss-disable
103+
"ovr_config//build_mode:tsan": ["-D__ET_BUILD_MODE_TSAN=1"], # @oss-disable
104+
"ovr_config//build_mode:ubsan": ["-D__ET_BUILD_MODE_UBSAN=1"], # @oss-disable
105+
"ovr_config//build_mode:lto-fat": ["-D__ET_BUILD_MODE_LTO=1"], # @oss-disable
106+
"ovr_config//build_mode:code-coverage": ["-D__ET_BUILD_MODE_COV=1"], # @oss-disable
107+
})
120108

121109
return kwargs
122110

@@ -125,16 +113,16 @@ def _patch_test_compiler_flags(kwargs):
125113
kwargs["compiler_flags"] = []
126114

127115
# Required globally by all c++ tests.
128-
kwargs["compiler_flags"].extend([
116+
kwargs["compiler_flags"] += [
129117
"-std=c++17",
130-
])
118+
]
131119

132120
# Relaxing some constraints for tests
133-
kwargs["compiler_flags"].extend([
121+
kwargs["compiler_flags"] += [
134122
"-Wno-missing-prototypes",
135123
"-Wno-unused-variable",
136124
"-Wno-error",
137-
])
125+
]
138126
return kwargs
139127

140128
def _external_dep_location(name):

0 commit comments

Comments
 (0)