From 96046d537052be1760017ce2a7fc66b4aa52fe44 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 19 May 2021 18:00:14 +0200
Subject: [PATCH] Tor Services: specify NDK since its used to strip binaries

Apparently, different versions of the NDK can strip binaries differently.
The native bits are reproducibly built in the tor-android binaries, then
just copied in by gradle.  But they might be stripped after that, so that
step needs to be reproducible as well.
---
 metadata/org.torproject.torservices.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/metadata/org.torproject.torservices.yml b/metadata/org.torproject.torservices.yml
index 4d5051f6ff..dc3a98cbb6 100644
--- a/metadata/org.torproject.torservices.yml
+++ b/metadata/org.torproject.torservices.yml
@@ -21,6 +21,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    ndk: r21e
 
   - versionName: '0.2'
     versionCode: 2001
@@ -29,6 +30,7 @@ Builds:
     gradle:
       - yes
     prebuild: echo 'abi-splits=x86' >> gradle.properties
+    ndk: r21e
 
   - versionName: '0.2'
     versionCode: 2002
@@ -37,6 +39,7 @@ Builds:
     gradle:
       - yes
     prebuild: echo 'abi-splits=x86_64' >> gradle.properties
+    ndk: r21e
 
   - versionName: '0.2'
     versionCode: 2003
@@ -45,6 +48,7 @@ Builds:
     gradle:
       - yes
     prebuild: echo 'abi-splits=armeabi-v7a' >> gradle.properties
+    ndk: r21e
 
   - versionName: '0.2'
     versionCode: 2004
@@ -53,6 +57,7 @@ Builds:
     gradle:
       - yes
     prebuild: echo 'abi-splits=arm64-v8a' >> gradle.properties
+    ndk: r21e
 
 ArchivePolicy: 8 versions
 AutoUpdateMode: None