[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-31130h'

[gk@xxxxxxxxxxxxxx]

commit 757acf012f08b6c68ed037ea095922b505e7f17e
Merge: b6aeb06 26be3f1
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Thu Dec 12 07:11:27 2019 +0000

    Merge remote-tracking branch 'sisbell/bug-31130h'

 projects/debootstrap-image/config       | 17 +++++++++--------
 projects/firefox/build                  |  1 +
 projects/firefox/config                 |  5 -----
 projects/https-everywhere/config        |  1 +
 projects/tor-android-service/config     |  6 ------
 projects/tor-browser/build.android      |  2 +-
 projects/tor-browser/config             |  1 -
 projects/tor-onion-proxy-library/config |  6 ------
 rbm.conf                                | 13 +++++++++++--
 9 files changed, 23 insertions(+), 29 deletions(-)

diff --cc projects/firefox/config
index c6f840b,74dbc78..2c7c037
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@@ -52,13 -54,9 +52,8 @@@ targets
      git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
      tag_gpg_id: 0
      var:
 -      torbrowser_update_channel: default
        branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly'
  
-   android:
-     var:
-       arch_deps:
-         - openjdk-8-jdk
- 
    linux:
      var:
        post_pkginst: |
diff --cc rbm.conf
index 0fe7acb,0ed6841..f94cf4a
--- a/rbm.conf
+++ b/rbm.conf
@@@ -233,10 -219,8 +233,10 @@@ targets
        android_min_api_x86: 16
        android_min_api_x86_64: 21
        snowflake: 0
 +      CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang'
 +      CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++'
        container:
-         suite: stretch
+         suite: buster
          arch: amd64
        deps:
          - build-essential

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits