1332827 - Port bug 1330533 to TB [Simplify the LibFuzzer setup in Gecko]

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Richard Marti (:Paenglab)]

In m-c they changed the LibFuzzer in nsBrowserApp.cpp. Not sure if we use this as the builds complete without the changes. But when we rely on this, future changes could break us and then it would be harder to find the cause.

Comment 1

[Richard Marti (:Paenglab)]

Attachment: LibFuzz.patch

Jörg, to check the patch you can use your before/after diff magic to be sure I found all changes. ;-)

Comment 2

[Jorg K (CEST = GMT+2)]

Comment on attachment 8829090 [details] [diff] [review]
LibFuzz.patch

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

(In reply to Richard Marti (:Paenglab) from comment #1)
> Jörg, to check the patch you can use your before/after diff magic to be sure
> I found all changes. ;-)
I'm afraid that was indeed necessary since the M-C bug had four changesets and three of them edited the same file nsBrowserApp.cpp.

Are you sure that the change to moz.build is correct? Check the file, there is for example:
LOCAL_INCLUDES += [
    '!/build',
    '/mozilla/toolkit/xre',

r+ with this fixed.

::: mail/app/moz.build
@@ +17,5 @@
>  
>  if CONFIG['LIBFUZZER']:
> +    USE_LIBS += [ 'fuzzer' ]
> +    LOCAL_INCLUDES += [
> +        '/tools/fuzzing/libfuzzer',

I think you need /mozilla/tools/ ...

Comment 3

[Richard Marti (:Paenglab)]

(In reply to Jorg K (GMT+1) from comment #2)
> Comment on attachment 8829090 [details] [diff] [review]
> LibFuzz.patch
> 
> Review of attachment 8829090 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> (In reply to Richard Marti (:Paenglab) from comment #1)
> > Jörg, to check the patch you can use your before/after diff magic to be sure
> > I found all changes. ;-)
> I'm afraid that was indeed necessary since the M-C bug had four changesets
> and three of them edited the same file nsBrowserApp.cpp.
> 
> Are you sure that the change to moz.build is correct? Check the file, there
> is for example:
> LOCAL_INCLUDES += [
>     '!/build',
>     '/mozilla/toolkit/xre',
> 
> r+ with this fixed.
> 
> ::: mail/app/moz.build
> @@ +17,5 @@
> >  
> >  if CONFIG['LIBFUZZER']:
> > +    USE_LIBS += [ 'fuzzer' ]
> > +    LOCAL_INCLUDES += [
> > +        '/tools/fuzzing/libfuzzer',
> 
> I think you need /mozilla/tools/ ...

Correct, good we have reviews. :-) Fixed. I'll land this after the next m-c push.

Comment 4

[Richard Marti (:Paenglab)]

https://hg.mozilla.org/comm-central/rev/a8a8f8a2b5cd637882b14f0f298f0724d5d15616