362514 - "official build" detection code doesn't work, treats all builds as "official"

Status: RESOLVED FIXED

(Toolkit :: Safe Browsing, defect)

Description

[:Gavin Sharp [email: [e-mail]]]

The code added in bug 344897 to use different URLs/IDs for "official" builds doesn't actually work, at least not on my Windows build. "$(origin BUILD_OFFICIAL)_$(origin MOZILLA_OFFICIAL)" is always "file_file", regardless of whether the build had MOZILLA_OFFICIAL or BUILD_OFFICIAL defined. I'm guessing this is because it's unconditionally set at http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/config/autoconf.mk.in&rev=3.413#544 . This has the result of treating all builds as "official".

Comment 1

[Benjamin Smedberg]

Why are we using $(origin) instead of just testing MOZILLA_OFFICIAL?

Comment 2

[:Gavin Sharp [email: [e-mail]]]

Attachment: patch

This is the same code I used for bug 362460.

Comment 3

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/components/safebrowsing/Makefile.in 	1.6

Comment 4

[J. Paul Reed [:preed]]

I had heard a report of this, but it was never confirmed.

I just stole this code from http://lxr.mozilla.org/mozilla1.8/source/config/Makefile.in#161, since this was originally written on the 1.8 branch; is this method of build officialness detection no longer valid on the trunk, or was it never valid anywhere?

Comment 5

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #4)
> I just stole this code from
> http://lxr.mozilla.org/mozilla1.8/source/config/Makefile.in#161, since this was
> originally written on the 1.8 branch; is this method of build officialness
> detection no longer valid on the trunk, or was it never valid anywhere?

It looks like it was always broken, but that it didn't matter until the first patch from bug 324690 landed. The second patch from bug 324690 made exactly the same change as the patch from this bug to fix it.