From 0643c4ebb5b04986cf51313e9ef63c2a5171cc5f Mon Sep 17 00:00:00 2001
From: Wei Li <weiwli@google.com>
Date: Wed, 9 Nov 2022 16:52:10 -0800
Subject: [PATCH] Fix the git_master_bazel mixed build breakage.

There is no cflags defined for cortex-a9 CPU variant, set it to ArmGenericCflags to fix the mixed build breakage for now.

Bug: 258397103
Test: m com.android.build --bazel-mode-staging
Change-Id: I79a9877846ced6334c09a4f5caf115c436f600e6
---
 cc/config/arm_device.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index b53a09782..981d1eaa6 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -222,6 +222,7 @@ var (
 		"":               "${config.ArmGenericCflags}",
 		"cortex-a7":      "${config.ArmCortexA7Cflags}",
 		"cortex-a8":      "${config.ArmCortexA8Cflags}",
+		"cortex-a9":      "${config.ArmGenericCflags}",
 		"cortex-a15":     "${config.ArmCortexA15Cflags}",
 		"cortex-a53":     "${config.ArmCortexA53Cflags}",
 		"cortex-a53.a57": "${config.ArmCortexA53Cflags}",