Update Dockerfile

Dockerfile

@@ -1,28 +1,107 @@
-# Используем JDK swaga
-FROM openjdk:11-jdk-slim
+FROM ubuntu:22.04
 
-# Устанавливаем необходимые утилиты
-RUN apt-get update && apt-get install -y curl unzip python3
+# 1. Подготовка среды (NDK r25c + SDK Tools)
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y \
+    build-essential cmake wget unzip git python3 \
+    openjdk-17-jdk-headless gettext libz-dev ninja-build zip \
+    && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /app
+ENV NDK_VERSION=r25c
+RUN wget -q https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip \
+    && unzip -q android-ndk-${NDK_VERSION}-linux.zip -d /opt \
+    && rm android-ndk-${NDK_VERSION}-linux.zip
+ENV ANDROID_NDK_HOME=/opt/android-ndk-${NDK_VERSION}
 
-# 1. Скачиваем правильные зависимости
-# android.jar API 31 (нужен для RenderEffect и новых функций)
-RUN curl -L -f "https://github.com/Sable/android-platforms/raw/refs/heads/master/android-31/android.jar" -o android.jar
+# Инструменты для сборки DEX (d8)
+RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O sdk.zip \
+    && mkdir -p /opt/android-sdk/cmdline-tools \
+    && unzip -q sdk.zip -d /tmp && mv /tmp/cmdline-tools/* /opt/android-sdk/cmdline-tools/latest && rm sdk.zip
+ENV PATH="/opt/android-sdk/cmdline-tools/latest/bin:/opt/android-sdk/build-tools/30.0.3:${PATH}"
+RUN yes | sdkmanager --sdk_root=/opt/android-sdk "platforms;android-30" "build-tools;30.0.3"
 
-# Aliuhook: качаем .aar и вытаскиваем из него бинарный classes.jar
-RUN curl -L -f "https://maven.aliucord.com/snapshots/com/aliucord/Aliuhook/1.1.3/Aliuhook-1.1.3.aar" -o aliuhook.aar && \
-    unzip aliuhook.aar classes.jar && \
-    mv classes.jar aliuhook.jar
+# 2. Настройка Кросс-компиляции (ARM64, API 30)
+ENV TARGET=aarch64-linux-android
+ENV API=30
+ENV TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64
+ENV CC=$TOOLCHAIN/bin/$TARGET$API-clang
+ENV CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
+ENV AR=$TOOLCHAIN/bin/llvm-ar
+ENV LD=$TOOLCHAIN/bin/ld.lld
+ENV RANLIB=$TOOLCHAIN/bin/llvm-ranlib
+ENV STRIP=$TOOLCHAIN/bin/llvm-strip
+ENV PREFIX=/build/deps
 
-# d8 (DEX compiler)
-RUN curl -L -f "https://maven.google.com/com/android/tools/r8/3.3.28/r8-3.3.28.jar" -o d8.jar
+WORKDIR /build
 
-RUN curl -L "https://github.com/coidarashka/MandreLib-Modules/raw/refs/heads/main/ZXVA.java" -o Main.java
+# 3. Сборка всех зависимостей В СТАТИКЕ
+# ZLIB
+RUN wget -q https://zlib.net/zlib-1.3.1.tar.gz && tar -xf zlib-1.3.1.tar.gz && cd zlib-1.3.1 \
+    && ./configure --prefix=$PREFIX --static && make -j$(nproc) install
 
+# OPENSSL (Важнейший компонент для HTTPS)
+RUN wget -q https://www.openssl.org/source/openssl-1.1.1w.tar.gz && tar -xf openssl-1.1.1w.tar.gz && cd openssl-1.1.1w \
+    && ./Configure android-arm64 no-shared no-tests --prefix=$PREFIX && make -j$(nproc) install_sw
+
+# EXPAT (Для разбора XML/WebDAV)
+RUN wget -q https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz && tar -xf expat-2.5.0.tar.gz && cd expat-2.5.0 \
+    && ./configure --host=$TARGET --prefix=$PREFIX --enable-static --disable-shared && make -j$(nproc) install
+
+# CURL (Транспорт для Git)
+RUN wget -q https://curl.se/download/curl-8.5.0.tar.gz && tar -xf curl-8.5.0.tar.gz && cd curl-8.5.0 \
+    && ./configure --host=$TARGET --prefix=$PREFIX --with-openssl=$PREFIX --with-zlib=$PREFIX \
+    --enable-static --disable-shared --disable-verbose --disable-ldap && make -j$(nproc) install
+
+# 4. Сборка GIT (Монструозная статика)
+RUN wget -q https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.43.0.tar.gz && tar -xf git-2.43.0.tar.gz && cd git-2.43.0 \
+    && export LDFLAGS="-static -L$PREFIX/lib" \
+    && export CPPFLAGS="-I$PREFIX/include" \
+    && ./configure --host=$TARGET --prefix=/data/local/tmp/git \
+    --with-curl=$PREFIX --with-zlib=$PREFIX --with-expat=$PREFIX --with-openssl=$PREFIX \
+    ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=no \
+    && make -j$(nproc) install NO_TCLTK=1 NO_GETTEXT=1 NO_PYTHON=1 NO_INSTALL_HARDLINKS=1
+
+# 5. Создание "Умного" Java-установщика
+RUN mkdir -p /build/java/ni/mandre/git
+RUN echo 'package ni.mandre.git; \n\
+import android.content.Context; \n\
+import java.io.*; \n\
+import java.lang.reflect.*; \n\
+import java.util.*; \n\
+public class GitInstaller { \n\
+    public static void install(Context ctx, byte[] gitData) { \n\
+        try { \n\
+            File binDir = ctx.getDir("bin", Context.MODE_PRIVATE); \n\
+            File gitBin = new File(binDir, "git"); \n\
+            // Пишем бинарник \n\
+            FileOutputStream fos = new FileOutputStream(gitBin); \n\
+            fos.write(gitData); fos.close(); \n\
+            gitBin.setExecutable(true, false); \n\
+            // ХАК: Регистрация в PATH текущего процесса через рефлексию \n\
+            injectPath(binDir.getAbsolutePath()); \n\
+            System.out.println("MandreGit: Installed and Path Injected!"); \n\
+        } catch (Exception e) { e.printStackTrace(); } \n\
+    } \n\
+    private static void injectPath(String newPath) throws Exception { \n\
+        Map<String, String> env = System.getenv(); \n\
+        Class<?> cl = env.getClass(); \n\
+        Field field = cl.getDeclaredField("m"); \n\
+        field.setAccessible(true); \n\
+        Map<String, String> writableEnv = (Map<String, String>) field.get(env); \n\
+        String path = writableEnv.get("PATH"); \n\
+        if (path == null || !path.contains(newPath)) { \n\
+            writableEnv.put("PATH", newPath + ":" + path); \n\
+        } \n\
+    } \n\
+}' > /build/java/ni/mandre/git/GitInstaller.java
+
+# Компиляция в DEX
+RUN javac -source 8 -target 8 -cp /opt/android-sdk/platforms/android-30/android.jar /build/java/ni/mandre/git/GitInstaller.java \
+    && d8 --output /build/git_setup.dex /build/java/ni/mandre/git/GitInstaller.class
+
+# 6. Финальный экспорт
+RUN cp /data/local/tmp/git/bin/git /build/git_arm64
+RUN zip -j /build/git_plugin_pack.zip /build/git_arm64 /build/git_setup.dex
 
-RUN javac -cp android.jar:aliuhook.jar -d . Main.java
-RUN java -cp d8.jar com.android.tools.r8.D8 --release --lib android.jar --classpath aliuhook.jar --output . b/liquidglass/Main*.class
-RUN mv classes.dex LiquidGlass.dex
 EXPOSE 7860
-CMD python3 -m http.server 7860
+CMD ["python3", "-m", "http.server", "7860"]