1229438 - Move Fennec background services code and resources to mobile/android/services

Status: RESOLVED FIXED

(Android Background Services Graveyard :: Build & Test, defect)

Description

[Nick Alexander :nalexander [he/him]]

This is part of Bug 1229149: moving code and resources into mobile/android/services.

I'm about to work on Bug 1220892, and it will be better to do that *after* moving everything rather than *before*, in case we ever want to revert it (or parts of it).

Comment 1

[Nick Alexander :nalexander [he/him]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=7b85c9ff8221

Comment 2

[Nick Alexander :nalexander [he/him]]

Attachment: MozReview Request: Bug 1229438 - Part 1: Move code. r?rnewman

Bug 1229438 - Part 1: Move code. r?rnewman

#!/bin/bash
mkdir -p mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/background mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/browserid mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/fxa mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/sync mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/tokenserver mobile/android/services/src/main/java/org/mozilla/gecko
hg mv mobile/android/base/reading mobile/android/services/src/main/java/org/mozilla/gecko

Comment 3

[Nick Alexander :nalexander [he/him]]

Attachment: MozReview Request: Bug 1229438 - Part 2: Move resources. r?rnewman

Bug 1229438 - Part 2: Move resources. r?rnewman

#!/bin/bash
set -x
pushd mobile/android/base/resources
for i in * ; do
    mkdir -p ../res/$i ;
    hg mv $i/{fxa,sync}* ../res/$i ;
done
popd
hg mv mobile/android/base/res mobile/android/services/src/main/res

Comment 4

[Nick Alexander :nalexander [he/him]]

Attachment: MozReview Request: Bug 1229438 - Part 3: Build fixes. r?rnewman

Bug 1229438 - Part 3: Build fixes. r?rnewman

Comment 5

[Richard Newman [:rnewman]]

Comment on attachment 8694342 [details]
MozReview Request: Bug 1229438 - Part 1: Move code. r?rnewman

https://reviewboard.mozilla.org/r/26725/#review24189

Comment 6

[Richard Newman [:rnewman]]

Comment on attachment 8694343 [details]
MozReview Request: Bug 1229438 - Part 2: Move resources. r?rnewman

https://reviewboard.mozilla.org/r/26727/#review24191

Comment 7

[Richard Newman [:rnewman]]

Comment on attachment 8694344 [details]
MozReview Request: Bug 1229438 - Part 3: Build fixes. r?rnewman

https://reviewboard.mozilla.org/r/26729/#review24193

::: mobile/android/app/base/build.gradle:34
(Diff revision 1)
> +                srcDir "${topsrcdir}/mobile/android/services/src/main/java/org"

Why does this need the 'org'? 'search' doesn't…

::: mobile/android/base/android-services.mozbuild:766
(Diff revision 1)
> -sync_java_files = [
> +sync_java_files = [TOPSRCDIR + '/mobile/android/services/src/main/java/org/mozilla/gecko/' + x for x in [

Smart approach.

If it builds, wfm.

Comment 8

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/c34c06e5b7a411c2f63f154c420027ff2c6e776e
Bug 1229438 - Part 1: Move Fennec services code. r=rnewman

https://hg.mozilla.org/integration/fx-team/rev/173c41a495cb8d4e380dcdbadebb41ea5b5a2088
Bug 1229438 - Part 2: Move Fennec services resources. r=rnewman

https://hg.mozilla.org/integration/fx-team/rev/62ee42d88bb26e7abeff15991bb3e60ff2a6d1a8
Bug 1229438 - Part 3: Update build. r=rnewman

Comment 9

[Nick Alexander :nalexander [he/him]]

(In reply to Richard Newman [:rnewman] from comment #7)
> Comment on attachment 8694344 [details]
> MozReview Request: Bug 1229438 - Part 3: Build fixes. r?rnewman
> 
> https://reviewboard.mozilla.org/r/26729/#review24193
> 
> ::: mobile/android/app/base/build.gradle:34
> (Diff revision 1)
> > +                srcDir "${topsrcdir}/mobile/android/services/src/main/java/org"
> 
> Why does this need the 'org'? 'search' doesn't…

Good catch!  Typo, and I didn't verify this configuration.

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/c34c06e5b7a4
https://hg.mozilla.org/mozilla-central/rev/173c41a495cb
https://hg.mozilla.org/mozilla-central/rev/62ee42d88bb2