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

Bug 28472: Add Android Makefile Rules

parent 6028be7e
...@@ -5,6 +5,9 @@ all: release ...@@ -5,6 +5,9 @@ all: release
release: submodule-update release: submodule-update
$(rbm) build release --target release --target torbrowser-all $(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 release-linux-x86_64: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64 $(rbm) build release --target release --target torbrowser-linux-x86_64
...@@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update ...@@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update
alpha: submodule-update alpha: submodule-update
$(rbm) build release --target alpha --target torbrowser-all $(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 alpha-linux-x86_64: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64 $(rbm) build release --target alpha --target torbrowser-linux-x86_64
...@@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update ...@@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update
nightly: submodule-update nightly: submodule-update
$(rbm) build release --target nightly --target torbrowser-all $(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 nightly-linux-x86_64: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64 $(rbm) build release --target nightly --target torbrowser-linux-x86_64
...@@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update ...@@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update
alpha_nightly: submodule-update alpha_nightly: submodule-update
$(rbm) build release --target alpha_nightly --target torbrowser-all $(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 alpha_nightly-linux-x86_64: submodule-update
$(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64
...@@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update ...@@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update
testbuild: submodule-update testbuild: submodule-update
$(rbm) build release --target testbuild --target torbrowser-all $(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 testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64 $(rbm) build release --target testbuild --target torbrowser-linux-x86_64
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
mkdir -p "$destdir" 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") -%] [% IF c("var/torbrowser-windows-i686") -%]
mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
......
...@@ -14,6 +14,10 @@ targets: ...@@ -14,6 +14,10 @@ targets:
- torbrowser-windows-i686 - torbrowser-windows-i686
- torbrowser-windows-x86_64 - torbrowser-windows-x86_64
- torbrowser-osx-x86_64 - torbrowser-osx-x86_64
- torbrowser-android-armv7
torbrowser-android-armv7:
var:
torbrowser-android-armv7: 1
torbrowser-linux-x86_64: torbrowser-linux-x86_64:
var: var:
torbrowser-linux-x86_64: 1 torbrowser-linux-x86_64: 1
...@@ -80,6 +84,13 @@ targets: ...@@ -80,6 +84,13 @@ targets:
input_files: input_files:
# Release # 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 - name: linux-x86_64
project: tor-browser project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") %]' enable: '[% c("var/torbrowser-linux-x86_64") %]'
......
Supports Markdown
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