From 289a5cbccc2ad880021400825d22b7c1f298545e Mon Sep 17 00:00:00 2001 From: lberki Date: Thu, 22 Mar 2018 01:29:16 -0700 Subject: Remove an unused flag. I don't know what it *was* used for, but it sure is never writen at the moment, nor is it useful on the command line. RELNOTES: None. PiperOrigin-RevId: 190031826 --- .../devtools/build/lib/rules/cpp/CppOptions.java | 28 ++++++---------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index e129cc8d83..2a9627845b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -490,32 +490,18 @@ public class CppOptions extends FragmentOptions { return enableLipoSettings() ? fdoOptimizeForBuild : null; } - @Option( - name = "autofdo_lipo_data", - defaultValue = "false", - category = "flags", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - help = - "If true then the directory name for non-LIPO targets will have a " - + "'-lipodata' suffix in AutoFDO mode." - ) - /** - * Never read FDO/LIPO options directly. This is because {@link #lipoConfigurationState} - * determines whether these options are actually "active" for this configuration. Instead, use the - * equivalent getter method, which takes that into account. - */ - public boolean autoFdoLipoDataForBuild; - /** * Returns the --autofdo_lipo_data value for this configuration. This is false except for data * configurations under LIPO builds. */ public boolean getAutoFdoLipoData() { - return enableLipoSettings() - ? autoFdoLipoDataForBuild - : lipoModeForBuild != LipoMode.OFF && fdoOptimizeForBuild != null && FdoSupport.isAutoFdo( - fdoOptimizeForBuild); + if (enableLipoSettings()) { + return false; + } + + return lipoModeForBuild != LipoMode.OFF + && fdoOptimizeForBuild != null + && FdoSupport.isAutoFdo(fdoOptimizeForBuild); } @Option( -- cgit v1.2.3