From f745ff5fd16a27403c22427b2ef3f028a09ae2be Mon Sep 17 00:00:00 2001
From: FriwiDev <friwidev@gmail.com>
Date: Thu, 18 Nov 2021 02:34:17 +0100
Subject: [PATCH] Use new jdk location on windows, change linux/arm/v7 to
 linux/arm/v6

---
 .github/workflows/build-linux-arm.yml             |  2 +-
 ...ld-windows-arm.yml => build-windows-arm64.yml} |  0
 DockerfileLinux                                   |  2 +-
 compile_linux.sh                                  |  2 +-
 scripts/run_windows.bat                           | 15 ++-------------
 5 files changed, 5 insertions(+), 16 deletions(-)
 rename .github/workflows/{build-windows-arm.yml => build-windows-arm64.yml} (100%)

diff --git a/.github/workflows/build-linux-arm.yml b/.github/workflows/build-linux-arm.yml
index 5cb512d..19804b0 100644
--- a/.github/workflows/build-linux-arm.yml
+++ b/.github/workflows/build-linux-arm.yml
@@ -28,5 +28,5 @@ jobs:
         name: Build
         run: |
           chmod +x compile_linux.sh
-          ./compile_linux.sh arm/v7 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
+          ./compile_linux.sh arm/v6 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
 
diff --git a/.github/workflows/build-windows-arm.yml b/.github/workflows/build-windows-arm64.yml
similarity index 100%
rename from .github/workflows/build-windows-arm.yml
rename to .github/workflows/build-windows-arm64.yml
diff --git a/DockerfileLinux b/DockerfileLinux
index f57c4b1..263d38b 100644
--- a/DockerfileLinux
+++ b/DockerfileLinux
@@ -3,7 +3,7 @@ FROM friwidev/jcefdocker:linux-latest AS stage
 #Declare build type argument (Release or Debug)
 ARG BUILD_TYPE
 
-#Declare architecture argument (arm64, arm/v7, 386 or amd64)
+#Declare architecture argument (arm64, arm/v6, 386 or amd64)
 ARG TARGETARCH
 
 #Declare git args
diff --git a/compile_linux.sh b/compile_linux.sh
index 418b2e5..f4a8c30 100755
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -4,7 +4,7 @@ if [ $# -lt 2 ] || [ $# -eq 3 ]
   then
     echo "Usage: ./compile_linux.sh <architecture> <buildType> [<gitrepo> <gitref>]"
     echo ""
-    echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v7, 386 or amd64."
+    echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v6, 386 or amd64."
     echo "buildType: either Release or Debug"
     echo "gitrepo: git repository url to clone"
     echo "gitref: the git commit id to pull"
diff --git a/scripts/run_windows.bat b/scripts/run_windows.bat
index ba91702..395aa86 100644
--- a/scripts/run_windows.bat
+++ b/scripts/run_windows.bat
@@ -26,13 +26,12 @@ if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio
 
 :: Edit PATH variable on 386 to use 32 bit jdk (cmake findjni does not actually care about JAVA_HOME)
 if "%TARGETARCH%"=="386" (set "PATH=C:/Program Files (x86)/Java/jdk1.8.0_211;%PATH%")
-if "%TARGETARCH%"=="arm64" (goto :ARMJVM)
+if "%TARGETARCH%"=="arm64" (set "PATH=C:/jdk-11;%PATH%")
 
 :: Perform build
-:CONTBUILD
 if "%TARGETARCH%"=="386" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
 if "%TARGETARCH%"=="amd64" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
-if "%TARGETARCH%"=="arm64" (cmake -G "Ninja" -DJAVA_HOME="C:/arm64jdk/%JDK%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
+if "%TARGETARCH%"=="arm64" (cmake -G "Ninja" -DJAVA_HOME="C:/jdk-11" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
 ninja -j4
 
 :: Compile java classes
@@ -59,13 +58,3 @@ cd jcef
 git checkout %REF%
 GOTO :BUILD
 
-:ARMJVM
-dir C:\arm64jdk
-FOR %%F IN (C:\arm64jdk\*) DO (
- set JDK=%%F
- goto cont
-)
-:cont
-set "PATH=C:/arm64jdk/%JDK%;%PATH%"
-echo %PATH%
-GOTO :CONTBUILD