Verified Commit dc3ea60c authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41500: Optimize for size on Android. 

Pass -Oz to tor and its dependencies.
parent bda3d714

projects/libevent/config

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ targets: 
      configure_opt_project: --disable-shared

  android:

    var:

      configure_opt_project: --disable-shared

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



input_files:

  - project: container-image

projects/openssl/config

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ targets: 
      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") %]'

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



input_files:

  - project: container-image

projects/tor/config

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ targets: 


  android:

    var:

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

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



input_files:

  - project: container-image

projects/zlib/build

+3 −2
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta 
cd /var/tmp/build/[% project %]-[% c('version') %]



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

  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- CC=[% c("arch") %]-w64-mingw32-cc -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"

  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- CC=[% c("arch") %]-w64-mingw32-cc -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install

  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- CC=[% c("arch") %]-w64-mingw32-cc -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c('var/CFLAGS') %] [% c('var/LDFLAGS') %]"

  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- CC=[% c("arch") %]-w64-mingw32-cc -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c('var/CFLAGS') %] [% c('var/LDFLAGS') %]" install

[% END -%]



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

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

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

  export CFLAGS="-Oz"

  ./configure --prefix=$distdir

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

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

projects/zstd/build

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta 
cd /var/tmp/build/[% project %]-[% c('version') %]

export CPPFLAGS=-DZSTD_MULTITHREAD

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

export CFLAGS="-Oz"

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

# Only need static libraries

rm $distdir/lib/libzstd.so*