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

[gk at torproject.org]

commit 4d0f9fa5fdd5831fbc2e28cb6c7b1056bd4deeab
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Jan 26 08:10:39 2019 +0000

    Bug 29182: Fix Android build bustage
    
    Updating the expat library (bug 1374012) resulted in broken compilation
    of Android builds as `arc4random_buf` is not defined compiling with our
    current toolchain.
    
    The upstream bug is
    https://bugzilla.mozilla.org/show_bug.cgi?id=1516642.
    
    Patch by a cypherpunk (mac198442).
---
 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 209f20e094dc..95ff14f8e154 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(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)
+#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__))
   (void)gather_time_entropy;
   arc4random_buf(&entropy, sizeof(entropy));
   return ENTROPY_DEBUG("arc4random_buf", entropy);