GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit b068c56f authored by sisbell's avatar sisbell Committed by Georg Koppen
Browse files

Bug 27443: Update Firefox RBM config and build for Android

parent f8d9731a
#!/bin/bash
[% c("var/setarch") -%]
[% c("var/set_default_env") -%]
[% IF c("var/android") %]
export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]"
[% END -%]
[% IF c("var/windows") -%]
[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %]
# We need a link to our GCC, otherwise the system cc gets used which points to
......@@ -10,6 +14,7 @@
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
distdir=/var/tmp/dist/[% project %]
mkdir -p /var/tmp/build
mkdir -p [% dest_dir _ '/' _ c('filename') %]
[% IF c("var/windows") -%]
mingwdir=/var/tmp/dist/mingw-w64
......@@ -143,6 +148,13 @@ rm -f js/src/configure
./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts
./mach build --verbose
[% IF c("var/android") %]
./mach package
cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk
[% RETURN %]
[% END %]
./mach build stage-package
[% IF c("var/osx") %]
......@@ -257,8 +269,6 @@ cd $distdir
[% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %]
[% END %]
mkdir -p [% dest_dir _ '/' _ c('filename') %]
[%
IF c("var/osx");
SET browserdir='"Tor Browser.app/Contents"';
......
......@@ -4,6 +4,7 @@ filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id")
git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
git_submodule: 1
gpg_keyring: torbutton.gpg
var:
......@@ -21,6 +22,8 @@ var:
- python
container:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 2
targets:
release:
......@@ -33,6 +36,11 @@ targets:
var:
torbrowser_update_channel: default
android-armv7:
var:
arch_deps:
- openjdk-8-jdk
linux:
var:
arch_deps:
......@@ -120,3 +128,7 @@ input_files:
enable: '[% c("var/linux") %]'
- filename: start-firefox
enable: '[% c("var/linux") %]'
- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% c("var/android") %]'
This diff is collapsed.
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
export MOZILLA_OFFICIAL=1
ac_add_options --enable-optimize
ac_add_options --enable-official-branding
ac_add_options --enable-application=mobile/android
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle
ac_add_options --with-android-version=16
ac_add_options --with-branding=mobile/android/branding/torbrowser
# Android NDK does not contain llvm-config so set clang path in options
ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64
ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang
if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then
ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
fi
if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
# Because Google Play will likely be the primary distribution medium,
# we disable updating and rely on Google Play by default. The
# Developer Policy explicitly prohibits in-app updating:
# An app distributed via Google Play may not modify, replace, or
# update itself using any method other than Google Plays update
# mechanism.
# https://play.google.com/about/privacy-security-deception/malicious-behavior/
ac_add_options --disable-tor-browser-update
ac_add_options --disable-signmar
ac_add_options --disable-verify-mar
fi
ac_add_options --enable-strip
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-rust-debug
ac_add_options --disable-maintenance-service
ac_add_options --disable-crashreporter
ac_add_options --disable-webrtc
ac_add_options --without-google-play-services
# Let's make sure no preference is enabling either Adobe's or Google's CDM.
ac_add_options --disable-eme
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment