From f5b0594fb721b3b272aadc9f41f9ac3c7b5185de Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 18:13:29 +0700 Subject: [PATCH 1/9] enable 16kb compatible for Android --- quickjs/android/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickjs/android/CMakeLists.txt b/quickjs/android/CMakeLists.txt index 927d9486e3..f5f9c011c6 100644 --- a/quickjs/android/CMakeLists.txt +++ b/quickjs/android/CMakeLists.txt @@ -8,3 +8,5 @@ file(GLOB_RECURSE sources "../common/native/*.c" "../common/native/*.cpp") add_library(quickjs SHARED ${sources}) target_link_libraries(quickjs) + +target_link_options(quickjs PRIVATE "-Wl,-z,max-page-size=16384") From 94fc552e1dc0418f6af73a709cc4b97a3ab31041 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 18:43:33 +0700 Subject: [PATCH 2/9] update version cmake --- jitpack.yml | 2 ++ quickjs/android/build.gradle | 1 + 2 files changed, 3 insertions(+) create mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000000..433b129038 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +install: + - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" diff --git a/quickjs/android/build.gradle b/quickjs/android/build.gradle index c878bdb125..faf2d31462 100644 --- a/quickjs/android/build.gradle +++ b/quickjs/android/build.gradle @@ -15,6 +15,7 @@ android { externalNativeBuild { cmake { + version "3.22.1" arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static' cFlags '-fstrict-aliasing', "-DCONFIG_VERSION=\\\"${quickJsVersion()}\\\"" cppFlags '-fstrict-aliasing', "-DCONFIG_VERSION=\\\"${quickJsVersion()}\\\"" From 535f6d52feeedf2a3917c4532d09bc6ac46bb256 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 18:50:28 +0700 Subject: [PATCH 3/9] fix missed build --- jitpack.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jitpack.yml b/jitpack.yml index 433b129038..dac283818a 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,4 @@ install: - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" + - ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION xtest -xlint installArchives + From 140e83eca09f264bc89df0b8d9ad41f5e8973028 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 21:29:07 +0700 Subject: [PATCH 4/9] remove invalid jitpack --- jitpack.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index dac283818a..0000000000 --- a/jitpack.yml +++ /dev/null @@ -1,4 +0,0 @@ -install: - - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" - - ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION xtest -xlint installArchives - From 3e9bd6c1003c916ee4de2d29344009a00cceec05 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 21:51:48 +0700 Subject: [PATCH 5/9] Revert "remove invalid jitpack" This reverts commit 140e83eca09f264bc89df0b8d9ad41f5e8973028. --- jitpack.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000000..9cc8f7e975 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,3 @@ +install: + - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" + - ./gradlew clean Pgroup=$GROUP -Pversion=$VERSION -xtest -xlint -xsignMavenPublication installArchives From ad286529648a945fd594c21d0ee3bae818b5ab66 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 22:25:31 +0700 Subject: [PATCH 6/9] fix missed - --- jitpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jitpack.yml b/jitpack.yml index 9cc8f7e975..9c3d6432f4 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,3 +1,3 @@ install: - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" - - ./gradlew clean Pgroup=$GROUP -Pversion=$VERSION -xtest -xlint -xsignMavenPublication installArchives + - ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION -xtest -xlint -xsignMavenPublication installArchives From e58aa98be8cf992386d1574a9889468c76fcc81f Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 23:00:34 +0700 Subject: [PATCH 7/9] update agp --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- jitpack.yml | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 jitpack.yml diff --git a/build.gradle b/build.gradle index 3e06f16a35..f44025fcb2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.1' classpath 'net.ltgt.gradle:gradle-errorprone-plugin:2.0.1' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf516..8049c684f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index 9c3d6432f4..0000000000 --- a/jitpack.yml +++ /dev/null @@ -1,3 +0,0 @@ -install: - - sdkmanager "cmake;3.22.1" "ndk;25.2.9519653" - - ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION -xtest -xlint -xsignMavenPublication installArchives From e3472ac14ffaf3056bd2794ae2a51c6937acfb8b Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 23:11:44 +0700 Subject: [PATCH 8/9] valid jdk --- jitpack.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000000..46c8529199 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11 \ No newline at end of file From 68a180ea369254d291c3bb4e71ca56d032222f25 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Fri, 19 Sep 2025 23:16:58 +0700 Subject: [PATCH 9/9] exclude javadoc --- jitpack.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jitpack.yml b/jitpack.yml index 46c8529199..1eb8985a6a 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,4 @@ jdk: - - openjdk11 \ No newline at end of file + - openjdk11 +install: + - ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION -xandroidJavadocs -xjavadoc -xtest -xlint -xsignMavenPublication installArchives