Backport 1477259 - Use different Android Version Codes in x86 and aarch64 packages

In Fennec 60, Mozilla assigned the x86 and aarch64 packages identical version codes. Mozilla didn't upload aarch64 packages onto Google Play (or any other app store), so they never noticed the conflict. They resolved this in bug 1477259 by changing how the version numbers are computed, but it landed after 60esr and it wasn't uplifted. Now we need this patch before August 1.

See also Mozilla's wiki page.

added TorBrowserTeam201907R component::applications/tor browser owner::tbb-team priority::high resolution::fixed severity::normal status::closed tbb-mobile type::defect labels

I pushed a patch, but building tor-android-service is failing.

* What went wrong:
Could not determine a usable local IP for this machine.

The branch for this backport is bug31260_0, in case someone can try it.

Replying to sysrqb:

I pushed a patch, but building tor-android-service is failing.

{{{

• What went wrong: Could not determine a usable local IP for this machine. }}}

Could you file a bug so we can track this down? Or is that just a local issue for you (but even then it might be worth putting the issue at least in a README or something in case someone else is stumbling over it)?

The branch for this backport is bug31260_0, in case someone can try it.

The patch looks good. I'll post links to bundles so you can test-feed them to Google to check whether we need more than this patch in a release.

Trac:
Priority: Medium to High
Keywords: N/A deleted, TorBrowserTeam201907 added

Replying to gk:

[snip]

I'll post links to bundles so you can test-feed them to Google to check whether we need more than this patch in a release.

Here we go:

https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-aarch64-31260-multi-qa.apk https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-aarch64-31260-multi-qa.apk.asc https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-armv7-31260-multi-qa.apk https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-armv7-31260-multi-qa.apk.asc https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-x86-31260-multi-qa.apk https://people.torproject.org/~gk/testbuilds/tor-browser-tbb-nightly-android-x86-31260-multi-qa.apk.asc

Thanks GeKo, I confirmed all three apks have different versionCodes and Google Play accepted them.

$ ls -l tor-browser-tbb-nightly-android-*-31260-multi-qa.apk
-rw-r--r-- 1 user user 44737322 Jul 30 15:43 tor-browser-tbb-nightly-android-aarch64-31260-multi-qa.apk
-rw-r--r-- 1 user user 44536642 Jul 30 15:42 tor-browser-tbb-nightly-android-armv7-31260-multi-qa.apk
-rw-r--r-- 1 user user 46019298 Jul 30 15:43 tor-browser-tbb-nightly-android-x86-31260-multi-qa.apk
$ 
$ for f in tor-browser-tbb-nightly-android-*-31260-multi-qa.apk; do ./android-sdk-linux/build-tools/28.0.2/aapt l -a $f  | grep versionCode; done
    A: android:versionCode(0x0101021b)=(type 0x10)0x7824464b
    A: android:versionCode(0x0101021b)=(type 0x10)0x78244649
    A: android:versionCode(0x0101021b)=(type 0x10)0x7824464d

Replying to gk:

Replying to sysrqb:

I pushed a patch, but building tor-android-service is failing.

{{{

• What went wrong: Could not determine a usable local IP for this machine. }}}

Could you file a bug so we can track this down? Or is that just a local issue for you (but even then it might be worth putting the issue at least in a README or something in case someone else is stumbling over it)?

I filed #31293 (moved).

Okay, thanks! I merged your patch to tor-browser-60.8.0esr-9.0-1 (commit c847e888cd2a4fb7cbddfe8fc890fe25a024faf7) and cherry-picked it to tor-browser-60.8.0esr-8.5-1 (commit 3111f2ee9a389db8d4c4f025b34314f8fe42d865).

Trac:
Keywords: TorBrowserTeam201907 deleted, TorBrowserTeam201907R added
Status: new to closed
Resolution: N/A to fixed

closed

moved to tpo/applications/tor-browser#31260 (closed)