924738 - Move third party sources outside of base

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Brian Nicholson (:bnicholson)]

Having all third party source directly under base (which is generally o.m.g.) is not IDE-friendly, so we should move them outside. This overlaps with bug 890586, but is less ambitious.

Here are the shell commands for all file moves, as requested by rnewman:
git mv httpclientandroidlib/ ../thirdparty/
git mv json-simple/ ../thirdparty/
git mv apache/ ../thirdparty/
git mv braille/ ../thirdparty/
git mv websockets/ ../thirdparty/

Thanks in advance for nalexander or rnewman for syncing these changes with the services branch :)

Comment 1

[Brian Nicholson (:bnicholson)]

Attachment: Move third party sources outside of base

Comment 2

[Brian Nicholson (:bnicholson)]

Oops, dependency works too.

Comment 3

[Brian Nicholson (:bnicholson)]

Attachment: Use package hierarchy for third party libs

I was going to keep this bug as simple as possible, but we want this change too if we really want to make IDE integration painless.

cd thirdparty/
git mv braille/com/ .
rm -r braille/
mkdir -p org/mozilla
git mv apache/ org/mozilla/
mkdir -p ch/boye
git mv httpclientandroidlib/ ch/boye/
mkdir -p com/codebutler
git mv websockets/ com/codebutler/android_websockets
mkdir org/json
git mv json-simple/ org/json/simple

Comment 4

[Nick Alexander :nalexander [he/him]]

In principle, I support this.  And, to my mind, in for a penny, in for a pound: we should follow Java's directory structure everywhere.

I have a few nits with the build system integration, and I'd kind of prefer to land Bug 923306 before doing this rename the world operation, but f+ from me.

Comment 5

[Richard Newman [:rnewman]]

Let's wait for the build bug to land before we do this, 'cos I think this is easier to reconstitute. Work for you, Brian?

Comment 6

[Brian Nicholson (:bnicholson)]

WFM

Comment 7

[Brian Nicholson (:bnicholson)]

Attachment: 0001-Bug-924738-Move-third-party-sources-outside-of-base.patch, v2

Rebased

Comment 8

[Brian Nicholson (:bnicholson)]

Attachment: 0002-Bug-924738-Use-package-hierarchy-for-third-party-lib.patch, v2

Rebased

Comment 9

[Richard Newman [:rnewman]]

Comment on attachment 817380 [details] [diff] [review]
0002-Bug-924738-Use-package-hierarchy-for-third-party-lib.patch, v2

These look fine to me, but needs build peer review.

Comment 10

[Richard Newman [:rnewman]]

Comment on attachment 817379 [details] [diff] [review]
0001-Bug-924738-Move-third-party-sources-outside-of-base.patch, v2

Fold these together?

Comment 11

[Richard Newman [:rnewman]]

Attachment: Part 3

This updates java-third-party-sources.mn, which isn't currently used in the build.

Comment 12

[Richard Newman [:rnewman]]

Upstream copy script change:

https://github.com/mozilla-services/android-sync/pull/365

Verified that with the three hg parts applied, this is a no-op when run.

Comment 13

[Gregory Szorc [:gps]]

Comment on attachment 817380 [details] [diff] [review]
0002-Bug-924738-Use-package-hierarchy-for-third-party-lib.patch, v2

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

IMO this counts as trivial and didn't require build peer review.

Comment 14

[Brian Nicholson (:bnicholson)]

Nick wants to wait for bug 925185 before we land this one.

Comment 15

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/070ebdc4a8e4

Comment 16

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/070ebdc4a8e4