[tor-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 29182: Fix Android build bustage"

[gk@xxxxxxxxxxxxxx]

commit 9b575de574d95df16c34e64e38aa6d0b53b76837
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Feb 25 07:53:53 2019 +0000

    Revert "Bug 29182: Fix Android build bustage"
    
    This reverts commit 5f2ca067b1a8baa523e60fd7d5e6a0202d669c2e.
---
 parser/expat/lib/xmlparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
index 95ff14f8e154..209f20e094dc 100644
--- a/parser/expat/lib/xmlparse.c
+++ b/parser/expat/lib/xmlparse.c
@@ -839,7 +839,7 @@ generate_hash_secret_salt(XML_Parser parser)
 {
   unsigned long entropy;
   (void)parser;
-#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__))
+#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)
   (void)gather_time_entropy;
   arc4random_buf(&entropy, sizeof(entropy));
   return ENTROPY_DEBUG("arc4random_buf", entropy);



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