Skip to content

Commit d7ffa8b

Browse files
kambati-metapytorchmergebot
authored andcommitted
12/n : Remove fbandroid_compiler_flags (pytorch#165558)
Summary: Currently `get_c2_fbandroid_xplat_compiler_flags()` is reading the `caffe2.strip_glog` buckconfig which we want to get rid of. This diff removes the `fbandroid_compiler_flags` arg and merges it with compiler_flags with a nested select and the select version of the method The goal is to get rid of all the usages of `get_c2_fbandroid_xplat_compiler_flags()` so that we can get rid of the `caffe2.strip_glog` buckconfig Test Plan: CI Differential Revision: D84626885 Pull Request resolved: pytorch#165558 Approved by: https://github.com/malfet
1 parent 00afa06 commit d7ffa8b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

buckbuild.bzl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,8 +1729,10 @@ def define_buck_targets(
17291729
"torch/csrc/jit/backends/backend_debug_info.cpp",
17301730
"torch/csrc/jit/backends/backend_interface.cpp",
17311731
],
1732-
compiler_flags = get_pt_compiler_flags(),
1733-
fbandroid_compiler_flags = c2_fbandroid_xplat_compiler_flags,
1732+
compiler_flags = get_pt_compiler_flags() + select({
1733+
"DEFAULT": [],
1734+
"ovr_config//os:android": c2_fbandroid_xplat_compiler_flags
1735+
}),
17341736
# @lint-ignore BUCKLINT link_whole
17351737
link_whole = True,
17361738
linker_flags = get_no_as_needed_linker_flag(),
@@ -2023,6 +2025,9 @@ def define_buck_targets(
20232025
"ovr_config//os:android-x86_64": [
20242026
"-mssse3",
20252027
],
2028+
}) + select({
2029+
"DEFAULT": [],
2030+
"ovr_config//os:android": c2_fbandroid_xplat_compiler_flags,
20262031
}),
20272032
exported_preprocessor_flags = get_aten_preprocessor_flags(),
20282033
exported_deps = [

0 commit comments

Comments
 (0)