Commit 0e1eba75 authored by Jeff Yoon's avatar Jeff Yoon Committed by Chromium LUCI CQ

Skip framework order check for chrome_pgo_phase = 1

Coverage instrumentation adds symbols in a different order to
what's expected. We don't need to check symbol order for
coverage instrumentation, so we'll skip it for now.

Bug: 1163903
Change-Id: I074365d0f8a85c513e0988e4452931903005cc98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2620000
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841982}
parent 9021e274
...@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni") ...@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni") import("//build/config/chromeos/ui_mode.gni")
import("//build/config/chromeos/ui_mode.gni") import("//build/config/chromeos/ui_mode.gni")
import("//build/config/compiler/compiler.gni") import("//build/config/compiler/compiler.gni")
import("//build/config/compiler/pgo/pgo.gni")
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/config/locales.gni") import("//build/config/locales.gni")
import("//build/config/python.gni") import("//build/config/python.gni")
...@@ -1069,7 +1070,9 @@ if (is_win) { ...@@ -1069,7 +1070,9 @@ if (is_win) {
assert(_framework_binary_path != "", assert(_framework_binary_path != "",
"Ignore configuration-dependent unused variable warning") "Ignore configuration-dependent unused variable warning")
if (!is_component_build) { # TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
# instrumentation adds these symbols in different orders
if (!is_component_build && chrome_pgo_phase != 1) {
action("verify_chrome_framework_order") { action("verify_chrome_framework_order") {
script = "//chrome/tools/build/mac/verify_order.py" script = "//chrome/tools/build/mac/verify_order.py"
stamp_file = "$target_out_dir/run_$target_name.stamp" stamp_file = "$target_out_dir/run_$target_name.stamp"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment