From aead9270f56ebc7302c7f5fa7e5dff959f26608e Mon Sep 17 00:00:00 2001 From: Ketan Ambati Date: Thu, 16 Oct 2025 20:41:21 +0000 Subject: [PATCH] 12/n : Remove fbandroid_compiler_flags (#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 bifferential Revision: D84626885 Pull Request resolved: https://github.com/pytorch/pytorch/pull/165558 Approved by: https://github.com/malfet --- buckbuild.bzl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buckbuild.bzl b/buckbuild.bzl index e60c02cd2ade..d56b55320c35 100644 --- a/buckbuild.bzl +++ b/buckbuild.bzl @@ -1729,8 +1729,10 @@ def define_buck_targets( "torch/csrc/jit/backends/backend_debug_info.cpp", "torch/csrc/jit/backends/backend_interface.cpp", ], - compiler_flags = get_pt_compiler_flags(), - fbandroid_compiler_flags = c2_fbandroid_xplat_compiler_flags, + compiler_flags = get_pt_compiler_flags() + select({ + "DEFAULT": [], + "ovr_config//os:android": c2_fbandroid_xplat_compiler_flags + }), # @lint-ignore BUCKLINT link_whole link_whole = True, linker_flags = get_no_as_needed_linker_flag(), @@ -2023,6 +2025,9 @@ def define_buck_targets( "ovr_config//os:android-x86_64": [ "-mssse3", ], + }) + select({ + "DEFAULT": [], + "ovr_config//os:android": c2_fbandroid_xplat_compiler_flags, }), exported_preprocessor_flags = get_aten_preprocessor_flags(), exported_deps = [