Merge remote-tracking branch 'gk/bug_27210_v3' (ba9064e4) · Commits · Matthew Finkel / tor-browser-build

Makefile

+15 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@ release: submodule-update
		release-android-armv7: submodule-update
		$(rbm) build release --target release --target torbrowser-android-armv7

		release-android-x86: submodule-update
		$(rbm) build release --target release --target torbrowser-android-x86

		release-linux-x86_64: submodule-update
		$(rbm) build release --target release --target torbrowser-linux-x86_64

		@@ -32,6 +35,9 @@ alpha: submodule-update
		alpha-android-armv7: submodule-update
		$(rbm) build release --target alpha --target torbrowser-android-armv7

		alpha-android-x86: submodule-update
		$(rbm) build release --target alpha --target torbrowser-android-x86

		alpha-linux-x86_64: submodule-update
		$(rbm) build release --target alpha --target torbrowser-linux-x86_64

		@@ -56,6 +62,9 @@ nightly: submodule-update
		nightly-android-armv7: submodule-update
		$(rbm) build release --target nightly --target torbrowser-android-armv7

		nightly-android-x86: submodule-update
		$(rbm) build release --target nightly --target torbrowser-android-x86

		nightly-linux-x86_64: submodule-update
		$(rbm) build release --target nightly --target torbrowser-linux-x86_64

		@@ -80,6 +89,9 @@ alpha_nightly: submodule-update
		alpha_nightly-android-armv7: submodule-update
		$(rbm) build release --target alpha_nightly --target torbrowser-android-armv7

		alpha_nightly-android-x86: submodule-update
		$(rbm) build release --target alpha_nightly --target torbrowser-android-x86

		alpha_nightly-linux-x86_64: submodule-update
		$(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64

		@@ -101,6 +113,9 @@ testbuild: submodule-update
		testbuild-android-armv7: submodule-update
		$(rbm) build release --target testbuild --target torbrowser-android-armv7

		testbuild-android-x86: submodule-update
		$(rbm) build release --target testbuild --target torbrowser-android-x86

		testbuild-linux-x86_64: submodule-update
		$(rbm) build release --target testbuild --target torbrowser-linux-x86_64

projects/android-toolchain/build

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,14 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME
		cd $NDK_HOME
		mv android-ndk-r15c/* .
		rm -fR android-ndk-r15c
		# API 16 is the minimum we currently support for Tor Browser on Android
		./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm

		# The architectures we support
		archs="arm x86"
		for arch in $archs; do
		# API 16 is the minimum we currently support for Tor Browser on Android for
		# 32bit.
		./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch
		done

		# Tool Archives
		cd $SDK_HOME

projects/firefox/config

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ targets:
		torbrowser_update_channel: default
		branding_directory: browser/branding/nightly

		android-armv7:
		android:
		var:
		arch_deps:
		- openjdk-8-jdk

projects/firefox/mozconfig-android-x86

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
		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=i386-linux-android
		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/x86/lib64
		ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/bin/clang

		ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
		ac_add_options --with-l10n-base=/var/tmp/dist/locales

		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

projects/orbot/config

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ var:
		gradle_dependencies_version: 1

		targets:
		android-armv7:
		android:
		var:
		arch_deps:
		- openjdk-8-jdk