761287 - Cannot build on NDK-8 due to conflicting struct sigcontext

Status: RESOLVED FIXED

(Toolkit :: Crash Reporting, defect)

Description

[Nathan Toone [:toonetown]]

Attachment: patch which fixes the build by renaming the struct to sigcontext_moz to avoid naming conflicts with the one provided by android NDK 8

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/535.18.5 (KHTML, like Gecko) Version/5.2 Safari/535.18.5

Steps to reproduce:

I am trying to build firefox mobile against Android ndk-8 on ubuntu linux.  All seems to build and work correctly, except for a compilation error due to the fact that the ndk now seems to include the headers that define struct sigcontext.  Some of the tools (the profiler and the crash reporter) define their own struct sigcontext to read this information, however, they won't build due to naming conflict.

I am building from the aurora branch, the tag FENNEC_14_0b5_RELEASE


Actual results:

Getting errors due to the fact that struct sigcontext is now defined in the headers for ndk8


Expected results:

Build should complete successfully.  I am attaching a patch which allows the code to build (simply renaming the struct to be called "sigcontext_moz" instead of "sigcontext").  I have not tested this patch against any other ndks or in any other build environments.

Comment 1

[Kevin Brosnan [Ex-Mozilla]]

The patch needs review from a Breakpad peer. https://developer.mozilla.org/En/Developer_Guide/How_to_Submit_a_Patch#Getting_reviews Ted whom I'm cc'ing on the bug should be able to review the patch.

Comment 2

[(not currently active) Ted Mielczarek]

Is there any way we could detect this in the source? Do the header files that provide this struct define anything detectable?

Comment 3

[(not currently active) Ted Mielczarek]

We obviously can't take this patch as-is, since it will break building with older NDKs (including the one we're using for official builds).

Comment 4

[(not currently active) Ted Mielczarek]

This was fixed upstream:
http://code.google.com/p/google-breakpad/source/detail?r=1000

Comment 5

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Patch (v1)

So Breakpad was half of the problem. This patch tries to fix the other half having to do with our profiler tool.

I think this is the right fix. Ehsan, can you take a look?

Try: https://tbpl.mozilla.org/?tree=Try&rev=9778a0b84217

Comment 6

[(no longer active)]

Comment on attachment 679289 [details] [diff] [review]
Patch (v1)

Review of attachment 679289 [details] [diff] [review]:
-----------------------------------------------------------------

::: tools/profiler/platform-linux.cc
@@ +53,5 @@
>  
>  static Sampler* sActiveSampler = NULL;
>  
>  
> +#if defined(ANDROID)

Nit: #ifdef.

Comment 7

[(inactive) Jim Chen [:jchen] [:darchons]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ec3ad127d567

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/ec3ad127d567

Comment 9

[Mike Hommey [:glandium]]

This breaks profiling builds:

tools/profiler/TableTicker.cpp: In member function 'void TableTicker::doBacktrace(ThreadProfile&, TickSample*)':
tools/profiler/TableTicker.cpp:829: warning: ISO C++ forbids braced-groups within expressions
tools/profiler/TableTicker.cpp:838: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:838: error: 'R0' was not declared in this scope
tools/profiler/TableTicker.cpp:839: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:839: error: 'R1' was not declared in this scope
tools/profiler/TableTicker.cpp:840: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:840: error: 'R2' was not declared in this scope
tools/profiler/TableTicker.cpp:841: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:841: error: 'R3' was not declared in this scope
tools/profiler/TableTicker.cpp:842: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:842: error: 'R4' was not declared in this scope
tools/profiler/TableTicker.cpp:843: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:843: error: 'R5' was not declared in this scope
tools/profiler/TableTicker.cpp:844: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:844: error: 'R6' was not declared in this scope
tools/profiler/TableTicker.cpp:845: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:845: error: 'R7' was not declared in this scope
tools/profiler/TableTicker.cpp:846: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:846: error: 'R8' was not declared in this scope
tools/profiler/TableTicker.cpp:847: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:847: error: 'R9' was not declared in this scope
tools/profiler/TableTicker.cpp:848: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:848: error: 'R10' was not declared in this scope
tools/profiler/TableTicker.cpp:849: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:849: error: 'R11' was not declared in this scope
tools/profiler/TableTicker.cpp:850: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:850: error: 'R12' was not declared in this scope
tools/profiler/TableTicker.cpp:851: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:851: error: 'R13' was not declared in this scope
tools/profiler/TableTicker.cpp:852: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:852: error: 'R14' was not declared in this scope
tools/profiler/TableTicker.cpp:853: error: 'struct sigcontext' has no member named 'gregs'
tools/profiler/TableTicker.cpp:853: error: 'R15' was not declared in this scope

struct sigcontext as defined in asm/sigcontext.h is not the same as what was defined in tools/profiler/android-signal-defs.h, and the code in TableTicker.cpp is now broken.

Comment 10

[(inactive) Jim Chen [:jchen] [:darchons]]

(In reply to Mike Hommey [:glandium] from comment #9)
> 
> struct sigcontext as defined in asm/sigcontext.h is not the same as what was
> defined in tools/profiler/android-signal-defs.h, and the code in
> TableTicker.cpp is now broken.

You're right. Reopening.

Comment 11

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Follow-up to fix TableTicker.cpp bustage (v1)

Try: https://tbpl.mozilla.org/?tree=Try&rev=5e99a97622fc

Comment 12

[(inactive) Jim Chen [:jchen] [:darchons]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/58cdbc0577de

Comment 13

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/58cdbc0577de