1191010 - [Shinano][Yukon] Use android-5.1.1_r8

Status: RESOLVED DUPLICATE of bug 1226363

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[:gerard-majax]

Let's use android-5.1.1_r8 on those platforms

Comment 1

[:gerard-majax]

Attachment: Manifest PR

Comment 2

[Adam Farden [:adfad666]]

The manifests were merged so we should upgrade sony-aosp-l.xml to the latest AOSP revision. _r29 looks to be the latest for us.

Shouldn't we also merge AOSP to the repos we have forked to b2g-5.1.1 branches? Can any of the big Android media related bugs affect us since we share many parts?

It might be good to merge anyway, just in case, rather than waste time worrying if they do or do not affect us.

Comment 3

[:gerard-majax]

I think that you are right and we need to rebase a lot of the b2g-r5.1 branches from AOSP. I'll defer the question to Michael.

Comment 4

[Michael Wu [:mwu]]

Go ahead and rebase them if you want. They aren't usually rebased simply because nobody bothers, but it doesn't hurt to rebase to a new tag. It should be possible to script a large part of the process. Just keep in mind that the b2g-a.b.c_rD branch names are derived directly from the corresponding android-a.b.c_rD tag so new branches are generated rather than merging.