From 977d46b611057913a9dd8c909d8782e9e2219c02 Mon Sep 17 00:00:00 2001
From: Dominic Letz <dominic.letz@berlin.de>
Date: Tue, 5 Dec 2023 13:30:53 +0100
Subject: [PATCH] Removed deprecated workaround for dockercross/arm

---
 lib/mix/tasks/android_beam.dockerfile | 6 +-----
 lib/runtimes.ex                       | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/mix/tasks/android_beam.dockerfile b/lib/mix/tasks/android_beam.dockerfile
index ca4a68a..321f24c 100644
--- a/lib/mix/tasks/android_beam.dockerfile
+++ b/lib/mix/tasks/android_beam.dockerfile
@@ -21,11 +21,7 @@ RUN ARCH="android-<%= @arch.id %> -D__ANDROID_API__=<%= @arch.abi %>" ./install_
 # Fetching OTP
 COPY _build/otp otp
 
-<%= if @arch.id == "arm" do %>
-ENV LIBS -L$NDK_ROOT/lib64/clang/12.0.5/lib/linux/ /usr/local/openssl/lib/libcrypto.a -lclang_rt.builtins-arm-android
-<% else %>
 ENV LIBS /usr/local/openssl/lib/libcrypto.a
-<% end %>
 
 # We need -z global for liberlang.so because:
 # https://android-ndk.narkive.com/iNWj05IV/weak-symbol-linking-when-loading-dynamic-libraries
@@ -45,7 +41,7 @@ config = "--with-ssl=/usr/local/openssl/ --disable-dynamic-ssl-lib --without-jav
 # config = if @arch.id == "x86_64", do: "--disable-jit #{config}", else: config
 config = "--disable-jit #{config}"
 %>
-RUN ./otp_build configure <%= config %>
+RUN ./otp_build setup <%= config %> || bash -c 'cat erts/config.log && exit 1'
 RUN ./otp_build boot -a
 
 # Build run #2, now creating the arm binaries, appliying the install flags only here...
diff --git a/lib/runtimes.ex b/lib/runtimes.ex
index 31d9a9d..f7d70b2 100644
--- a/lib/runtimes.ex
+++ b/lib/runtimes.ex
@@ -74,9 +74,7 @@ defmodule Runtimes do
       File.mkdir_p!("_build")
 
       Runtimes.run(
-        "git clone #{Runtimes.otp_source()} _build/otp && cd _build/otp && git checkout #{
-          Runtimes.otp_tag()
-        }"
+        "git clone #{Runtimes.otp_source()} _build/otp && cd _build/otp && git checkout #{Runtimes.otp_tag()}"
       )
     end
   end