[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41180: Avoid some copies for the expert bundles.

[morgan (@morgan)]

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
5a9ee2bd by Pier Angelo Vendrame at 2024-08-27T18:34:40+02:00
Bug 41180: Avoid some copies for the expert bundles.

AndroidManifest.xml should be copied only in tor-expert-bundle when
doing Android builds.
The compiler is not needed in tor-expert-bundle-aar.

- - - - -
d994819d by Pier Angelo Vendrame at 2024-08-28T16:41:52+02:00
Bug 41224: Do not ship Conjure and GeoIP databases on some Android configurations.

- - - - -


3 changed files:

- projects/tor-expert-bundle-aar/config
- projects/tor-expert-bundle/build
- projects/tor-expert-bundle/config


Changes:

=====================================
projects/tor-expert-bundle-aar/config
=====================================
@@ -8,8 +8,6 @@ var:
 
 input_files:
   - project: container-image
-  - name: '[% c("var/compiler") %]'
-    project: '[% c("var/compiler") %]'
   - project: tor-expert-bundle
     name: tor-expert-bundle-armv7
     target_replace:
@@ -25,4 +23,4 @@ input_files:
   - project: tor-expert-bundle
     name: tor-expert-bundle-x86_64
     target_replace:
-      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
\ No newline at end of file
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'


=====================================
projects/tor-expert-bundle/build
=====================================
@@ -15,7 +15,9 @@ mkdir pluggable_transports && cd pluggable_transports
 
 tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
 tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
-tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
+[% IF c('input_files_by_name/conjure') -%]
+  tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
+[% END -%]
 
 # add per-platform pt extension
 awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json
@@ -33,11 +35,15 @@ cd $distdir
   mkdir -p aar/assets/common
 
   cp -a tor/libTor.so aar/jni/$abi/
-  cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
   cp -a tor/pluggable_transports/lyrebird aar/jni/$abi/libObfs4proxy.so
   cp -a tor/pluggable_transports/snowflake-client aar/jni/$abi/libSnowflake.so
+  [% IF c('input_files_by_name/conjure') -%]
+    cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
+  [% END -%]
 
-  cp -a data/* aar/assets/common/
+  # tor-browser-build#41224, tor-browser#42607: Currently we do not use the
+  # GeoIP databases. So, we avoid copying them to save space on the final APK.
+  # cp -a data/* aar/assets/common/
 
   cp -a tor/pluggable_transports/pt_config.json aar/assets/common/
 
@@ -57,4 +63,4 @@ cd $distdir
     tar_src => tar_src,
     tar_args => '-czvf' _ dest_dir _ '/' _ c('filename') _ '/tor-expert-bundle.tar.gz',
   });
-%]
\ No newline at end of file
+%]


=====================================
projects/tor-expert-bundle/config
=====================================
@@ -20,5 +20,7 @@ input_files:
     project: snowflake
   - name: conjure
     project: conjure
+    enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]'
   - filename: pt_config.json
   - filename: AndroidManifest.xml
+    enable: '[% c("var/android") %]'



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/b159153f6390e74ffd28248b5d2011b54bd5153c...d994819d7de35438ed094463ebb56094dedb0039

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/b159153f6390e74ffd28248b5d2011b54bd5153c...d994819d7de35438ed094463ebb56094dedb0039
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240828/ec4e4874/attachment-0001.htm>