From 80f1ef15ccf595f3c8a3a0a5b74e88f60623d45a Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 27 Jan 2023 13:33:45 -0800 Subject: [PATCH] Change grep pattern so it can report number of CppCompile actions correctly without being impacted by setting -march on command line twice. Bug: 266930443 Test: build/soong/tests/apex_cc_module_arch_variant_tests.sh Change-Id: Ifd74e8cfc86dd94fce632beac049cc81430bfc46 --- tests/apex_cc_module_arch_variant_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/apex_cc_module_arch_variant_tests.sh b/tests/apex_cc_module_arch_variant_tests.sh index 97e6576c0..b0cade19f 100755 --- a/tests/apex_cc_module_arch_variant_tests.sh +++ b/tests/apex_cc_module_arch_variant_tests.sh @@ -56,7 +56,7 @@ build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2b # Number of CppCompile actions with arch variant flag actions_with_arch_variant_num=$(call_bazel aquery --config=bp2build --config=ci --config=android \ - 'mnemonic("CppCompile", deps(//build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex))' | grep -c "\-march=$ARCH_VARIANT_CFLAG") + 'mnemonic("CppCompile", deps(//build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex))' | grep -c \'-march=$ARCH_VARIANT_CFLAG\') # Number of all CppCompile actions all_cppcompile_actions_num=0