commit 760178fda1e29256fc63013bc27d798fe3fed999 Author: sisbell shane.isbell@gmail.com Date: Mon Feb 10 15:25:04 2020 -0800

Bug 33216: Add Android Host and ABI Info to RBM.conf --- rbm.conf | 9 +++++++++ 1 file changed, 9 insertions(+)

diff --git a/rbm.conf b/rbm.conf index 97b7850..d7a11c6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -196,6 +196,8 @@ targets: android-armv7: 1 osname: android-armv7 toolchain_arch: arm + configure_host: arm-linux-androideabi + abi: armeabi-v7a torbrowser-android-x86: - android-x86 - android @@ -205,6 +207,8 @@ targets: android-x86: 1 osname: android-x86 toolchain_arch: x86 + configure_host: i686-linux-android + abi: x86 torbrowser-android-x86_64: - android-x86_64 - android @@ -214,6 +218,8 @@ targets: android-x86_64: 1 osname: android-x86_64 toolchain_arch: x86_64 + configure_host: x86_64-linux-android + abi: x86_64 torbrowser-android-aarch64: - android-aarch64 - android @@ -223,6 +229,8 @@ targets: android-aarch64: 1 osname: android-aarch64 toolchain_arch: arm64 + configure_host: aarch64-linux-android + abi: arm64-v8a android: var: android: 1 @@ -247,6 +255,7 @@ targets: - zip - unzip - libtinfo5 + configure_opt: CC=clang --host=[% c("var/configure_host") %] [% c("var/configure_opt_project") %]

pre_pkginst: | SNAPSHOT_VERSION=20191201T212855Z