commit 836a8b56606978fa7a140cfd1a9d9ddb6b2e41e2
Author: sisbell <shane.isbell(a)gmail.com>
Date: Thu Nov 15 20:27:38 2018 -0800
Bug 28472: Add Android Makefile Rules
---
Makefile | 15 +++++++++++++++
projects/release/build | 4 ++++
projects/release/config | 11 +++++++++++
3 files changed, 30 insertions(+)
diff --git a/Makefile b/Makefile
index 4c21a83..8ec5d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ all: release
release: submodule-update
$(rbm) build release --target release --target torbrowser-all
+release-android-armv7: submodule-update
+ $(rbm) build release --target release --target torbrowser-android-armv7
+
release-linux-x86_64: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64
@@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update
alpha: submodule-update
$(rbm) build release --target alpha --target torbrowser-all
+alpha-android-armv7: submodule-update
+ $(rbm) build release --target alpha --target torbrowser-android-armv7
+
alpha-linux-x86_64: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64
@@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update
nightly: submodule-update
$(rbm) build release --target nightly --target torbrowser-all
+nightly-android-armv7: submodule-update
+ $(rbm) build release --target nightly --target torbrowser-android-armv7
+
nightly-linux-x86_64: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64
@@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update
alpha_nightly: submodule-update
$(rbm) build release --target alpha_nightly --target torbrowser-all
+alpha_nightly-android-armv7: submodule-update
+ $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7
+
alpha_nightly-linux-x86_64: submodule-update
$(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64
@@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update
testbuild: submodule-update
$(rbm) build release --target testbuild --target torbrowser-all
+testbuild-android-armv7: submodule-update
+ $(rbm) build release --target testbuild --target torbrowser-android-armv7
+
testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
diff --git a/projects/release/build b/projects/release/build
index 882d26d..2c9912f 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -4,6 +4,10 @@
[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
mkdir -p "$destdir"
+[% IF c("var/torbrowser-android-armv7") -%]
+ mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
+ [% RETURN %]
+[% END -%]
[% IF c("var/torbrowser-windows-i686") -%]
mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
diff --git a/projects/release/config b/projects/release/config
index 8605aa2..65e297d 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -14,6 +14,10 @@ targets:
- torbrowser-windows-i686
- torbrowser-windows-x86_64
- torbrowser-osx-x86_64
+ - torbrowser-android-armv7
+ torbrowser-android-armv7:
+ var:
+ torbrowser-android-armv7: 1
torbrowser-linux-x86_64:
var:
torbrowser-linux-x86_64: 1
@@ -80,6 +84,13 @@ targets:
input_files:
# Release
+ - name: android-armv7
+ project: tor-browser
+ enable: '[% c("var/torbrowser-android-armv7") %]'
+ target:
+ - '[% c("var/build_target") %]'
+ - torbrowser-android-armv7
+
- name: linux-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") %]'