[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41548: Unify CFLAGS definition for Android.

Title: GitLab

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

Commits:

  • 0508c07b
    by Pier Angelo Vendrame 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.
  • 00f0cf66
    by Pier Angelo Vendrame at 2025-08-21T15:19:57+02:00 
    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.

6 changed files:

Changes:

  • projects/libevent/config
    ... ... @@ -17,7 +17,7 @@ targets:
    17 17 
           configure_opt_project: --disable-shared
    18 18 
       android:
    19 19 
         var:
    20 
    -      configure_opt_project: --disable-shared CFLAGS="-Oz"
    20 
    +      configure_opt_project: --disable-shared CFLAGS="[% c('var/CFLAGS') %]"
    21 21
    22 22 
     input_files:
    23 23 
       - project: container-image

  • projects/openssl/config
    ... ... @@ -26,7 +26,7 @@ targets:
    26 26 
           configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128'
    27 27 
       android:
    28 28 
         var:
    29 
    -      configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] -Oz'
    29 
    +      configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %] [% c("var/CFLAGS") %]'
    30 30
    31 31 
     input_files:
    32 32 
       - project: container-image

  • projects/tor/config
    ... ... @@ -43,7 +43,7 @@ targets:
    43 43
    44 44 
       android:
    45 45 
         var:
    46 
    -      configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc CFLAGS=-Oz'
    46 
    +      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"'
    47 47
    48 48 
     input_files:
    49 49 
       - project: container-image

  • projects/zlib/build
    ... ... @@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
    14 14 
     [% IF c("var/android") -%]
    15 15 
       export CHOST=[% c("var/cross_prefix") %]
    16 16 
       export CC=[% c("var/CC") %]
    17 
    -  export CFLAGS="-Oz"
    17 
    +  export CFLAGS="[% c('var/CFLAGS') %]"
    18 18 
       ./configure --prefix=$distdir
    19 19 
       make -j[% c("num_procs") %]
    20 20 
       make -j[% c("num_procs") %] install

  • projects/zstd/build
    ... ... @@ -8,7 +8,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta
    8 8 
     cd /var/tmp/build/[% project %]-[% c('version') %]
    9 9 
     export CPPFLAGS=-DZSTD_MULTITHREAD
    10 10 
     export CC=[% c("var/CC") %]
    11 
    -export CFLAGS="-Oz"
    11 
    +export CFLAGS="[% c('var/CFLAGS') %]"
    12 12 
     make -C lib -j[% c("num_procs") %] PREFIX=$distdir install
    13 13 
     # Only need static libraries
    14 14 
     rm $distdir/lib/libzstd.so*

  • rbm.conf
    ... ... @@ -470,6 +470,7 @@ targets:
    470 470 
           compiler: android-toolchain
    471 471 
           android_min_api: 21
    472 472 
           CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
    473 
    +      CFLAGS: '-Oz -fvisibility=hidden'
    473 474 
           container:
    474 475 
             suite: bookworm
    475 476 
             arch: amd64

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6100c67a3510070dcb491f60275af72282ba186a...00f0cf666218b20813349a9be98c79266decc36c at 1755783376 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx