fix: remove redundant -Wl,-z,relro,-z,now to fix UnsatisfiedLinkError on 16k-page-size builds (#563)

* fix: remove -Wl,-z,relro,-z,now to fix UnsatisfiedLinkError on 16k-page-size builds

Fixes #562 — crash on Samsung S21 Plus (Android 14) with 3.1.1-16k-min:
  dlopen failed: can't enable GNU RELRO protection for libCGEExt.so: Out of memory

Root cause:
  target_link_options(CGE PUBLIC ... -Wl,-z,relro,-z,now) propagated these
  flags to CGEExt via PUBLIC linkage. With 16KB page alignment enabled, the
  linker pads PT_GNU_RELRO to 16KB boundaries, making MemSiz (~10KB) far
  exceed the actual RW LOAD segment size (~1.5KB). The Android dynamic linker
  then calls mprotect() over a region larger than what was mapped, which fails
  with ENOMEM on devices under memory pressure.

  Android (API 23+) enforces full RELRO by default; these flags are redundant.

Changes:
  - CMakeLists.txt: remove -Wl,-z,relro,-z,now; change scope to PRIVATE so
    the remaining -fPIE -fPIC -pie flags do not propagate unnecessarily.
    The -Wl,-z,max-page-size=16384 block retains PUBLIC scope so CGEExt
    inherits 16KB alignment automatically via CMake interface propagation.
  - cgeDemo/build.gradle: add disableVideoModule() helper and make the
    testDemoWithGradleLibs dependency string dynamic (supports all four
    AAR variants: default, -16k, -min, -16k-min)."

* fix: address review comments in CMakeLists.txt

- Remove redundant Chinese comment '# 非 Debug 模式下添加 -O3' (keep English only)
- Fix full-width comma (U+FF0C) to ASCII comma in RELRO note comment
- Remove target_link_options(CGE PRIVATE -fPIE -fPIC -pie): these flags are
  inappropriate/redundant for a SHARED library; CMake handles -fPIC automatically

* chore: bump version to 3.1.2

Author: wysaid

CHANGE.md

@@ -1,6 +1,10 @@
 
 ====== Changelist =========
 
+# 2026-2 Version 3.1.2 #
+
+1. Fix UnsatisfiedLinkError crash on 16KB-page-size builds (Samsung S21+ / Android 14): remove redundant `-Wl,-z,relro,-z,now` linker flags from CMakeLists.txt. Android API 23+ enforces full RELRO by default; the explicit flags caused `PT_GNU_RELRO MemSiz` to exceed the mapped RW LOAD segment on 16KB-aligned builds, triggering an `mprotect()` failure with `ENOMEM`. (Fixes #562)
+
 # 2018-6 Version 2.5.0 #
 
 1. Add class `org.wysaid.view.CameraGLSurfaceViewWithBuffer` to do camera preview with buffer.

build.gradle

@@ -38,7 +38,7 @@ ext {
             minSdkVersion    : 21,
             targetSdkVersion : 25, // higher target version needs more storage permission request.
             versionCode      : 2,
-            versionName      : "3.1.1",
+            versionName      : "3.1.2",
             applicationId    : "org.wysaid.cgeDemo",
             appcompatX       : "1.2.0",
             ndkVersion       : "26.3.11579264",

cgeDemo/build.gradle

@@ -19,6 +19,10 @@ def testDemoWithGradleLibs() {
     return gradle.ext != null && gradle.ext.has("testDemoWithGradleLibs") && gradle.ext.testDemoWithGradleLibs;
 }
 
+def disableVideoModule() {
+    return gradle.ext != null && gradle.ext.has("disableVideoModule") && gradle.ext.disableVideoModule;
+}
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -55,7 +59,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     if (testDemoWithGradleLibs()) {
-        implementation 'org.wysaid:gpuimage-plus:3.1.1'
+        // Dynamically select the correct AAR variant based on local.properties flags.
+        // This allows testing specific published variants (e.g. 3.1.1-16k-min) from maven.
+        def baseVersion = rootProject.ext.android.versionName
+        def variant = ''
+        if (enable16kPageSizes()) variant += '-16k'
+        if (disableVideoModule()) variant += '-min'
+        implementation "org.wysaid:gpuimage-plus:${baseVersion}${variant}"
     } else {
         implementation project(':library')
     }

library/src/main/jni/CMakeLists.txt

@@ -80,10 +80,11 @@ endif()
 
 target_compile_definitions(CGE PUBLIC ANDROID_NDK=1 CGE_LOG_TAG=\"libCGE\" CGE_TEXTURE_PREMULTIPLIED=1 _CGE_DISABLE_GLOBALCONTEXT_=1 _CGE_ONLY_FILTERS_=1)
 
-# 非 Debug 模式下添加 -O3
+# Add -O3 in non-Debug mode
 target_compile_options(CGE PRIVATE $<$<NOT:$<CONFIG:Debug>>:-O3>)
 
-target_link_options(CGE PUBLIC -fPIE -fPIC -pie -Wl,-z,relro,-z,now)
+# Note: -Wl,-z,relro,-z,now is intentionally omitted here, fixing issue: <https://github.com/wysaid/android-gpuimage-plus/issues/562>
+# Android API 23+ enforces full RELRO by default; no explicit linker hardening flags are needed.
 
 target_link_libraries(CGE PUBLIC
     GLESv2