GitLab

at 2025-08-21T15:17:58+02:00

Bug 41548: Unify CFLAGS definition for Android.

Avoid repeating -Oz, instead use a variable from rbm.conf.

Bug 41548: Set tor's visibility to hidden on Android.

This helps to reduce the size of the tor binary on Android by almost 1MB
uncompressed and 370kB compressed on x86.
Add also other interesting linking options.

       configure_opt_project: --disable-shared

   android:

     var:

-      configure_opt_project: --disable-shared CFLAGS="-Oz"

+      configure_opt_project: --disable-shared CFLAGS="[% c('var/CFLAGS') %]"

 input_files:

   - project: container-image

       configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128'

   android:

     var:

-      configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] -Oz'

+      configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] [% c("var/CFLAGS") %]'

 input_files:

   - project: container-image

   android:

     var:

-      configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc CFLAGS=-Oz'

+      configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="-Wl,--icf=safe -Wl,--pack-dyn-relocs=relr -Wl,--exclude-libs,ALL"'

 input_files:

   - project: container-image

 [% IF c("var/android") -%]

   export CHOST=[% c("var/cross_prefix") %]

   export CC=[% c("var/CC") %]

-  export CFLAGS="-Oz"

+  export CFLAGS="[% c('var/CFLAGS') %]"

   ./configure --prefix=$distdir

   make -j[% c("num_procs") %]

   make -j[% c("num_procs") %] install

 cd /var/tmp/build/[% project %]-[% c('version') %]

 export CPPFLAGS=-DZSTD_MULTITHREAD

 export CC=[% c("var/CC") %]

-export CFLAGS="-Oz"

+export CFLAGS="[% c('var/CFLAGS') %]"

 make -C lib -j[% c("num_procs") %] PREFIX=$distdir install

 # Only need static libraries

 rm $distdir/lib/libzstd.so*

       compiler: android-toolchain

       android_min_api: 21

       CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'

+      CFLAGS: '-Oz -fvisibility=hidden'

       container:

         suite: bookworm

         arch: amd64

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

6 changed files:

Changes: