[tor-commits] [tor-browser-build/master] Bug 33801: Upgrade Go Project to use new Android Toolchain

[sysrqb at torproject.org]

commit 420d7fedac209b4a9c53ecde5e4ecda49b02ee7f
Author: sisbell <shane.isbell at gmail.com>
Date:   Thu Apr 2 15:40:58 2020 -0700

    Bug 33801: Upgrade Go Project to use new Android Toolchain
---
 projects/go/build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/go/build b/projects/go/build
index 02fba2b..1096549 100644
--- a/projects/go/build
+++ b/projects/go/build
@@ -68,7 +68,11 @@ cd /var/tmp/dist/go/src
   CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
 [% ELSIF c("var/android") -%]
   patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch
-  CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash
+  [% IF c("var/android-fenix") -%]
+    CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CC= CFLAGS= LDFLAGS= ./make.bash
+  [% ELSE -%]
+    CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash
+  [% END -%]
 [% END -%]
 
 # This directory is non-reproducible and doesn't exist in official Go releases,