[tor-bugs] #32993 [Applications/Tor Browser]: Package Tor With Tor Android Service Project

[Tor Bug Tracker & Wiki]

#32993: Package Tor With Tor Android Service Project
-------------------------------------------------+-------------------------
 Reporter:  sisbell                              |          Owner:  tbb-
                                                 |  team
     Type:  defect                               |         Status:
                                                 |  needs_review
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-mobile, tbb-rbm, tbb-parity,     |  Actual Points:
  TorBrowserTeam202004R                          |
Parent ID:  #28704                               |         Points:
 Reviewer:  sysrqb                               |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by sysrqb):

 * cc: boklm (added)


Comment:

 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
 +
 }}}

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/32993#comment:8>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online