Skip to content

Commit

Permalink
[Orderfile] Tentative fix for orderfile build on Android
Browse files Browse the repository at this point in the history
dummy.c was failing to link under the orderfile build due to
undefined references to __cyg_profile_func_enter and
__cyg_profile_func_exit.

This is because the orderfile build enables
-finstrument-functions.

This patch attempts to fix that by explicitly disabling
cygprofile instrumentation for dummy.c

BUG=750120
TBR=agrieve@chromium.org,pasko@chromium.org

Change-Id: Ibe3cbbc5b55103840e7b55c3921cae242b185bba
Reviewed-on: https://chromium-review.googlesource.com/600311
Reviewed-by: John Mellor <johnme@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Egor Pasko <pasko@chromium.org>
Commit-Queue: John Mellor <johnme@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491741}
  • Loading branch information
johnmellor authored and Commit Bot committed Aug 3, 2017
1 parent d5885b8 commit 94d9075
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tools/resources/generate_resource_whitelist.gni
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ template("generate_resource_whitelist") {
sources = [
"//tools/resources/dummy.c",
]

# dummy.c should be built without -finstrument-functions (crbug.com/750120).
configs -= [ "//build/config/android:default_cygprofile_instrumentation" ]
configs += [ "//build/config/android:no_cygprofile_instrumentation" ]
}
action(target_name) {
deps = [
Expand Down

0 comments on commit 94d9075

Please sign in to comment.