Package Tor With Tor Android Service Project

Currently tor-android-service uses pre-built tor library. Start using the tor library that is part of the build.

Trac:
Parent Ticket: #28704 (moved)

added TorBrowserTeam202004R component::applications/tor browser owner::tbb-team parent::28704 priority::medium resolution::fixed reviewer::sysrqb severity::normal status::closed tbb-mobile tbb-parity tbb-rbm type::defect labels

Moving tickets to February

Trac:
Keywords: TorBrowserTeam202001 deleted, TorBrowserTeam202002 added

Packages tor into android library

!https://github.com/sisbell/tor-browser-build/commits/bug-32993

Trac:
Status: new to needs_review

Trac:
Keywords: TorBrowserTeam202002 deleted, TorBrowserTeam202002R added

We are no longer in February moving reviews

Trac:
Keywords: TorBrowserTeam202002R deleted, TorBrowserTeam202003R added

Trac:
Reviewer: N/A to boklm

We are no longer in March

Trac:
Keywords: TorBrowserTeam202003R deleted, TorBrowserTeam202004R added

I wonder why I did that.

Trac:
Reviewer: boklm to sysrqb

Is there a reason to extract tor.tar.gz into a temporary directory and then copy all of the content into service/src/main? Can we simply extract tor.tar.gz directly into service/src/main instead?

Maybe boklm has an opinion on this.

diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build
index 8f8d16d5..1521217f 100644
--- a/projects/tor-android-service/build
+++ b/projects/tor-android-service/build
@@ -8,10 +8,11 @@ cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
 cp -r $gradle_repo/plugins-release/* $gradle_repo
 cp -r $gradle_repo/maven2/* $gradle_repo
 
-mkdir -p /var/tmp/build $output_dir
+mkdir -p /var/tmp/build /var/tmp/dist/tor $output_dir
 
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+tar -C /var/tmp/dist/tor -xf [% c('input_files_by_name/tor') %]/tor.tar.gz
 
 cd /var/tmp/build/[% project %]-[% c('version') %]
 patch -p1 < $rootdir/remove-native-build.patch
@@ -19,6 +20,10 @@ patch -p1 < $rootdir/remove-native-build.patch
 # Remove native files, otherwise build will fail after gradle.patch
 rm -fR service/src/main/jni
 
+# Replace pre-packaged tor library with the latest build
+rm -fR service/src/main/jniLibs/*
+cp -r /var/tmp/dist/tor/* service/src/main
+

Trac:
Cc: sysrqb, sisbell, hans@guardianproject.info, tbb-team to sysrqb, sisbell, hans@guardianproject.info, tbb-team, boklm

Replying to sysrqb:

Is there a reason to extract tor.tar.gz into a temporary directory and then copy all of the content into service/src/main? Can we simply extract tor.tar.gz directly into service/src/main instead?

Yes, I think we should extract it in service/src/main directly.

Trac:
Keywords: TorBrowserTeam202004R deleted, TorBrowserTeam202004 added
Status: needs_review to needs_revision

Replying to boklm:

Replying to sysrqb:

Is there a reason to extract tor.tar.gz into a temporary directory and then copy all of the content into service/src/main? Can we simply extract tor.tar.gz directly into service/src/main instead?

Yes, I think we should extract it in service/src/main directly. We have under consideration the uploading the tor packages to a central repo (like maven central). If we package directly into 'service/src/main' then that won't work cleanly with other projects that want to use tor for android.

Replying to sisbell:

Replying to boklm:

Replying to sysrqb:

Is there a reason to extract tor.tar.gz into a temporary directory and then copy all of the content into service/src/main? Can we simply extract tor.tar.gz directly into service/src/main instead?

Yes, I think we should extract it in service/src/main directly. We have under consideration the uploading the tor packages to a central repo (like maven central). If we package directly into 'service/src/main' then that won't work cleanly with other projects that want to use tor for android.

The proposed patch is extracting tor to /var/tmp/dist/tor, before copying it to service/src/main. Why can't we just extract it to service/src/main? I don't think it changes anything related to maven central, it's just a simplification of tor-android-service build script.

This change includes

• moved the 'remove-native-build.patch' patch in same block as removing the old jni lib since they are part of same operation
• extracted tor directly to 'service/src/main'

https://github.com/sisbell/tor-browser-build/commits/bug-32993a

Trac:
Status: needs_revision to needs_review

Replying to sisbell:

This change includes

• moved the 'remove-native-build.patch' patch in same block as removing the old jni lib since they are part of same operation
• extracted tor directly to 'service/src/main'

https://github.com/sisbell/tor-browser-build/commits/bug-32993a

This looks good to me. I merged this branch to master with commit acfda9f43d3203bb12913b56cbf8c3891a16253c.

I checked that it builds correctly on all android platforms. However I didn't check that the apk is working correctly.

Trac:
Status: needs_review to closed
Resolution: N/A to fixed
Keywords: TorBrowserTeam202004 deleted, TorBrowserTeam202004R added

Replying to boklm:

Replying to sisbell:

This change includes

• moved the 'remove-native-build.patch' patch in same block as removing the old jni lib since they are part of same operation
• extracted tor directly to 'service/src/main'

https://github.com/sisbell/tor-browser-build/commits/bug-32993a

This looks good to me. I merged this branch to master with commit acfda9f43d3203bb12913b56cbf8c3891a16253c.

I checked that it builds correctly on all android platforms. However I didn't check that the apk is working correctly.

It is not. The log says it's still the old Tor that is loaded when testing a nightly build containing all the fixes for #28704 (moved) and children. I opened #33930 (moved) for that.

closed

mentioned in issue #33930 (moved)

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

mentioned in issue tpo/applications/tor-browser#41251 (closed)