[tbb-commits] [tor-browser-build/maint-9.5] Bug 40012: Add build target for all Android arches

[gk at torproject.org]

commit aca5c381638beacf86d2660d3d6e94f4e5996acf
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Jul 6 18:39:31 2020 +0000

    Bug 40012: Add build target for all Android arches
---
 Makefile                | 12 ++++++++++++
 projects/release/config |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/Makefile b/Makefile
index 6d82f93..cb7edc5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ all: release
 release: submodule-update
 	$(rbm) build release --target release --target torbrowser-all
 
+release-android: submodule-update
+	$(rbm) build release --target release --target torbrowser-all-android
+
 release-android-armv7: submodule-update
 	$(rbm) build release --target release --target torbrowser-android-armv7
 
@@ -41,6 +44,9 @@ release-src: submodule-update
 alpha: submodule-update
 	$(rbm) build release --target alpha --target torbrowser-all
 
+alpha-android: submodule-update
+	$(rbm) build release --target alpha --target torbrowser-all-android
+
 alpha-android-armv7: submodule-update
 	$(rbm) build release --target alpha --target torbrowser-android-armv7
 
@@ -77,6 +83,9 @@ alpha-src: submodule-update
 nightly: submodule-update
 	$(rbm) build release --target nightly --target torbrowser-all
 
+nightly-android: submodule-update
+	$(rbm) build release --target nightly --target torbrowser-all-android
+
 nightly-android-armv7: submodule-update
 	$(rbm) build release --target nightly --target torbrowser-android-armv7
 
@@ -113,6 +122,9 @@ nightly-src: submodule-update
 testbuild: submodule-update
 	$(rbm) build release --target testbuild --target torbrowser-all
 
+testbuild-android: submodule-update
+	$(rbm) build release --target testbuild --target torbrowser-all-android
+
 testbuild-android-armv7: submodule-update
 	$(rbm) build release --target testbuild --target torbrowser-android-armv7
 
diff --git a/projects/release/config b/projects/release/config
index 17db3d0..c6e883b 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -19,6 +19,12 @@ targets:
     - torbrowser-android-x86_64
     - torbrowser-android-aarch64
     - torbrowser-src
+  torbrowser-all-android:
+    - torbrowser-android-armv7
+    - torbrowser-android-x86
+    - torbrowser-android-x86_64
+    - torbrowser-android-aarch64
+    - torbrowser-src
   torbrowser-android-armv7:
     var:
       torbrowser-android-armv7: 1
@@ -60,6 +66,7 @@ targets:
   notarget:
     - release
     - torbrowser-all
+    - torbrowser-all-android
 
   noversiondir:
     var: