1430313 - Don't take brand.dtd from object directory in mobile/android

Status: RESOLVED FIXED

(Firefox Build System :: Android Studio and Gradle Integration, enhancement)

Description

[Nick Alexander :nalexander [he/him]]

Right now, there's a subtle dependency in the build system that's not expressed: mobile/android/base depends on the branding directory being built before it.

I think this was culted from browser/, which has localized branding in browser/branding/official/.  However, none of the mobile/android branding is localized -- it's all en-US -- so this isn't necessary.

It's responsible for tickets like https://bugzilla.mozilla.org/show_bug.cgi?id=1299137 and for generally difficult to work around orderings during repacks.

We should just stop doing this.

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1430313 - Don't take brand.dtd from object directory.

This thorn in my side turns out to be unnecessary!  For reasons
unknown, brand.dtd is not localized for mobile/android/ in the way it
is for browser/.  That means we can just pull from the branding
directory, which avoids a frustrating issue where single-locale
repacks couldn't actually produce strings.xml since the subtle
dependency on the branding directory being built first wasn't
satisfied.

Review commit: https://reviewboard.mozilla.org/r/212660/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/212660/

Comment 2

[Michael Shal [:mshal]]

Comment on attachment 8942378 [details]
Bug 1430313 - Don't take brand.dtd from object directory.

https://reviewboard.mozilla.org/r/212660/#review218930

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a1a5efa349c4
Don't take brand.dtd from object directory. r=mshal

Comment 4

[Cosmin Sabou [:CosminS]]

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