[tbb-commits] [tor-browser-build/master] Bug 33760: Update rbm.conf to match NDK 20

[sysrqb at torproject.org]

commit 336564a4572965ba3f3b8730a93a7e0bf0584107
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jun 11 09:50:50 2020 +0000

    Bug 33760: Update rbm.conf to match NDK 20
    
    Based on a patch by sisbell, thanks!
    
    We make it clearer that we are concerned with the cross compilation
    prefix (so that all the necessary tools can be found) by renaming
    `configure_host` to `cross_prefix`.
    
    Additionally, we reorder the `configure_opt` arguments a bit to closer
    match other platforms.
    
    Finally, we introduce the Fenix related targets to be able to build
    Tor Browser based on Fennec and Fenix in parallel for the time being.
---
 rbm.conf | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/rbm.conf b/rbm.conf
index 92c3293..9d74a37 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -196,9 +196,17 @@ targets:
         - zip
         - unzip
 
+  torbrowser-android-fenix-armv7:
+    - android-fenix-armv7
+    - android-armv7
+    - android-fenix
+    - android
   torbrowser-android-armv7:
     - android-armv7
     - android
+  android-fenix-armv7:
+    var:
+      cross_prefix: armv7a-linux-androideabi
   android-armv7:
     arch: armv7
     var:
@@ -207,9 +215,17 @@ targets:
       toolchain_arch: arm
       configure_host: arm-linux-androideabi
       abi: armeabi-v7a
+  torbrowser-android-fenix-x86:
+    - android-fenix-x86
+    - android-x86
+    - android-fenix
+    - android
   torbrowser-android-x86:
     - android-x86
     - android
+  android-fenix-x86:
+    var:
+      cross_prefix: i686-linux-android
   android-x86:
     arch: x86
     var:
@@ -218,9 +234,17 @@ targets:
       toolchain_arch: x86
       configure_host: i686-linux-android
       abi: x86
+  torbrowser-android-fenix-x86_64:
+    - android-fenix-x86_64
+    - android-x86_64
+    - android-fenix
+    - android
   torbrowser-android-x86_64:
     - android-x86_64
     - android
+  android-fenix-x86_64:
+    var:
+      cross_prefix: x86_64-linux-android
   android-x86_64:
     arch: x86_64
     var:
@@ -229,9 +253,17 @@ targets:
       toolchain_arch: x86_64
       configure_host: x86_64-linux-android
       abi: x86_64
+  torbrowser-android-fenix-aarch64:
+    - android-fenix-aarch64
+    - android-aarch64
+    - android-fenix
+    - android
   torbrowser-android-aarch64:
     - android-aarch64
     - android
+  android-fenix-aarch64:
+    var:
+      cross_prefix: aarch64-linux-android
   android-aarch64:
     arch: aarch64
     var:
@@ -240,17 +272,24 @@ targets:
       toolchain_arch: arm64
       configure_host: aarch64-linux-android
       abi: arm64-v8a
+  android-fenix:
+    var:
+      android-fenix: 1
+      compiler: fenix-android-toolchain
+      CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
+      CXX: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
+      configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]'
   android:
     var:
       android: 1
       compiler: android-toolchain
-      # API 16 is the minimum we currently support for Tor Browser on Android
       android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
-      # API 21 is the minimum we currently support for arm64 on Android
-      android_min_api_aarch64: 21
+      # API 16 is the minimum we currently support for 32 bit on Android
       android_min_api_armv7: 16
       android_min_api_x86: 16
+      # API 21 is the minimum we currently support for 64 bit on Android
       android_min_api_x86_64: 21
+      android_min_api_aarch64: 21
       CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang'
       CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++'
       # We only build snowflake on the alpha and nightly