(Test) Live patch latest jdk8u

.github/workflows/build.yml

@@ -9,7 +9,8 @@ jobs:
   build_android:
     strategy:
       matrix:
-        arch: [ "aarch32", "aarch64", "x86", "x86_64" ]
+        # TODO: aarch32
+        arch: [ "aarch64", "x86", "x86_64" ]
       fail-fast: false
 
     name: "Build for Android ${{matrix.arch}}"
@@ -39,42 +40,6 @@ jobs:
         name: "jre8-debuginfo-${{matrix.arch}}"
         path: dizout
 
-  build_iosport:
-    name: "Build for iOS aarch64"
-    runs-on: macOS-latest
-    continue-on-error: true
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: set up JDK 1.7
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.7
-
-    - name: Build with CI build script
-      run: |
-        export BUILD_IOS=1
-        bash "ci_build_arch_aarch64.sh"
-
-    - name: Upload JDK build output
-      uses: actions/upload-artifact@v2
-      with:
-        name: "jdk8-ios-aarch64"
-        path: jdk8*.tar.xz
-
-    - name: Upload JRE build output
-      uses: actions/upload-artifact@v2
-      with:
-        name: 'jre8-ios-aarch64'
-        path: jre8*.tar.xz
-
-    - name: Upload JRE debuginfo build output
-      uses: actions/upload-artifact@v2
-      with:
-        name: "jre8-ios-debuginfo-aarch64"
-        path: dizout
-
   pojav:
     needs: build_android
     runs-on: ubuntu-20.04

buildjdk.sh

@@ -56,8 +56,12 @@ fi
 # fix building libjawt
 ln -s -f $CUPS_DIR/cups $ANDROID_INCLUDE/
 
+FREEMARKER=$PWD/freemarker-2.3.8/lib/freemarker.jar
+
 cd openjdk
-#rm -rf build
+
+# Apply patches
+git apply patches/jdk8u_android.diff
 
 #   --with-extra-cxxflags="$CXXFLAGS -Dchar16_t=uint16_t -Dchar32_t=uint32_t" \
 #   --with-extra-cflags="$CPPFLAGS" \
@@ -71,6 +75,7 @@ bash ./configure \
     --with-extra-cflags="$CFLAGS" \
     --with-extra-cxxflags="$CFLAGS" \
     --with-extra-ldflags="$LDFLAGS" \
+    --with-freemarker-jar=$FREEMARKER \
     --enable-option-checking=fatal \
     --with-jdk-variant=normal \
     --with-jvm-variants="${JVM_VARIANTS/AND/,}" \
@@ -81,6 +86,7 @@ bash ./configure \
     --with-fontconfig-include=$ANDROID_INCLUDE \
     --with-freetype-lib=$FREETYPE_DIR/lib \
     --with-freetype-include=$FREETYPE_DIR/include/freetype2 \
+    --with-toolchain-type=clang \
     $AUTOCONF_x11arg $AUTOCONF_EXTRA_ARGS \
     --x-libraries=/usr/lib \
         $platform_args || \

clonejdk.sh

@@ -5,5 +5,5 @@ git clone --depth 1 https://github.com/PojavLauncherTeam/openjdk-aarch32-jdk8u o
 elif [ "$BUILD_IOS" == "1" ]; then
 git clone --depth 1 --branch ios https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u openjdk
 else
-git clone --depth 1 https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u openjdk
+git clone --depth 1 https://github.com/openjdk/jdk8u openjdk
 fi

getlibs.sh

@@ -6,6 +6,11 @@ set -e
 
 wget https://downloads.sourceforge.net/project/freetype/freetype2/$BUILD_FREETYPE_VERSION/freetype-$BUILD_FREETYPE_VERSION.tar.gz
 tar xf freetype-$BUILD_FREETYPE_VERSION.tar.gz
+
 wget https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz
 tar xf cups-2.2.4-source.tar.gz
-rm cups-2.2.4-source.tar.gz freetype-$BUILD_FREETYPE_VERSION.tar.gz
+
+wget https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download -O freemarker-2.3.8.tar.gz
+tar -xzf freemarker-2.3.8.tar.gz
+
+rm cups-2.2.4-source.tar.gz freetype-$BUILD_FREETYPE_VERSION.tar.gz freemarker-2.3.8.tar.gz