From 3b2347d5a71ecec57d45eebdcce615d15620e7d8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 20:13:20 +0100
Subject: force rebuild of docker-ndk image. Print out JAVA_HOME and java
 version

---
 docker/android-ndk/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index ffe189b3..485160d4 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -37,6 +37,9 @@ ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION}
 ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip
 ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools
 
+RUN echo $JAVA_HOME
+RUN java --version
+
 RUN curl -L $ANDROID_NDK_URL -o ndk.zip  \
     && unzip ndk.zip -d $ANDROID_HOME/ndk  \
     && rm -rf ndk.zip
-- 
cgit v1.2.3


From 22189050755b96c71464f58c1d1efe32aaf55162 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 21:35:06 +0100
Subject: * remove deprecated flag android.disableAutomaticComponentCreation in
 tor-android's gradle.properties * don't build javadocs in tor-android for now

---
 tor-android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-android b/tor-android
index 5d7bc0b0..853b255b 160000
--- a/tor-android
+++ b/tor-android
@@ -1 +1 @@
-Subproject commit 5d7bc0b0bf97dd1f682b54ecaaecb3eb19d29adb
+Subproject commit 853b255b0edc4ede4e56f296096885e05d8998c9
-- 
cgit v1.2.3