From 3e6e97585dd41e31b6ca3bfe3bed10abc3614fe4 Mon Sep 17 00:00:00 2001
From: juliexxia <juliexxia@google.com>
Date: Fri, 29 Jan 2021 12:29:24 -0800
Subject: [PATCH] Have `canonicalize-flags` command inherit from the build
 command in order to pick up build-specified --flag_alias settings from rc
 files.

PiperOrigin-RevId: 354587068
---
 .../build/lib/runtime/commands/CanonicalizeCommand.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
index cb4ec6c30ae3f0..7ccbb2a9313c80 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
@@ -50,8 +50,8 @@
 @Command(
     name = "canonicalize-flags",
     options = {CanonicalizeCommand.Options.class, PackageOptions.class},
-    // inherits from query to get proper package loading options.
-    inherits = {QueryCommand.class},
+    // inherits from build to get proper package loading options and rc flag aliases.
+    inherits = {BuildCommand.class},
     allowResidue = true,
     mustRunInWorkspace = false,
     shortDescription = "Canonicalizes a list of %{product} options.",