Merge pull request #176 from backtrace-labs/feature/16kb_alignment

16 KB page-size support, compileSdk 35, AGP 8.5 #176
GSON fix - implement ThrowableTypeAdapterFactory #178

Author: melekr

.github/workflows/test.yml

@@ -33,9 +33,20 @@ jobs:
           echo BACKTRACE_CORONER_URL=\"${{ secrets.BACKTRACE_CORONER_URL }}\" >> ./local.properties
           echo BACKTRACE_CORONER_TOKEN=\"${{ secrets.BACKTRACE_CORONER_TOKEN }}\" >> ./local.properties
 
+      - name: Accept Android SDK licences
+        run: yes | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --licenses    
+
       - name: Build and check
         run: ./gradlew assembleDebug assembleDebugAndroidTest build check
 
+      - name: Alignment script executable
+        run: chmod +x scripts/check_elf_alignment.sh
+
+      - name: Verify 16-KB alignment (arm64-v8a & x86_64)
+        run: |
+          scripts/check_elf_alignment.sh \
+            example-app/build/outputs/apk/debug/example-app-debug.apk
+
       - name: Upload symbols.zip
         uses: actions/upload-artifact@v4
         with:

backtrace-library/build.gradle

@@ -1,8 +1,8 @@
 plugins {
+    id 'com.android.library'
     id 'com.gladed.androidgitversion' version '0.4.14'
     id "com.vanniktech.maven.publish" version "0.29.0" apply true
 }
-apply plugin: 'com.android.library'
 
 import com.vanniktech.maven.publish.SonatypeHost
 
@@ -16,10 +16,10 @@ android {
     namespace "backtraceio.library"
     defaultConfig {
         minSdkVersion 21
-        compileSdk 34
-        targetSdkVersion 34
-        versionName androidGitVersion.name()
-        versionCode androidGitVersion.code()
+        compileSdk 35
+        // TODO: BT-5924 Android 35 update -> noinspection OldTargetApi,EditedTargetSdkVersion
+        targetSdkVersion 35
+        ndkVersion "27.0.11718014-beta1"
         buildConfigField("String", "VERSION_NAME", "\"${versionName}\"")
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -29,6 +29,7 @@ android {
                 cppFlags ""
                 arguments "-DCMAKE_BUILD_TYPE=Release"
                 arguments "-DCRASHPAD_HTTPS_TRANSPORT=OPENSSL"
+                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
             }
         }
         ndk {
@@ -54,7 +55,7 @@ android {
     externalNativeBuild {
         cmake {
             path file('src/main/cpp/CMakeLists.txt')
-            version "3.22.1"
+            version "3.31.6"
         }
     }
     sourceSets {

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientSendTest.java

@@ -112,7 +112,7 @@ public void sendExceptionWithManyCause() {
                 final String mainExceptionExpectedMessage = expectedExceptionMessages.pop();
                 assertEquals(mainExceptionExpectedMessage, mainExceptionMessage);
                 assertTrue(exceptionProperties.getJSONArray("stack-trace").length() > 0);
-                assertEquals(mainExceptionExpectedMessage, exceptionProperties.get("detail-message"));
+                assertEquals(mainExceptionExpectedMessage, exceptionProperties.get("message"));
 
             } catch (JSONException e) {
                 e.printStackTrace();

backtrace-library/src/main/cpp/CMakeLists.txt

@@ -54,6 +54,14 @@ add_library(# Sets the name of the library.
 
 target_compile_features(backtrace-native PRIVATE cxx_std_17)
 
+# Android 15 & later: make every LOAD segment 16 KB-aligned so the .so files
+# can work on kernels that use 16 KB pages. Has zero impact on 4 KB devices.
+if (ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "x86_64")
+    target_link_options(backtrace-native PRIVATE
+        -Wl,-z,max-page-size=16384
+        -Wl,-z,common-page-size=16384)
+endif()
+
 if (BACKEND STREQUAL "CRASHPAD_BACKEND")
     target_compile_definitions(backtrace-native PRIVATE -DCRASHPAD_BACKEND)
 
@@ -107,6 +115,10 @@ list(APPEND LIBS backtrace-native)
 list(APPEND LIBS ${log-lib})
 
 if (BACKEND STREQUAL "CRASHPAD_BACKEND")
+    # Pass 16 KB linker flags to Crashpad’s handler so libcrashpad_handler.so loads on 16 KB kernels.
+    set(CRASHPAD_GN_ARGS_FILE
+        "${CMAKE_CURRENT_SOURCE_DIR}/build_args/args_android.gn")
+
     set(CRASHPAD_HANDLER_GENERATE_STATIC_LIB true)
     add_subdirectory(crashpad)
     target_link_libraries(backtrace-native client)

backtrace-library/src/main/cpp/build_args/args_android.gn

@@ -0,0 +1,4 @@
+ldflags = [
+  "-Wl,-z,max-page-size=16384",
+  "-Wl,-z,common-page-size=16384",
+]

backtrace-library/src/main/cpp/crashpad

@@ -8,6 +8,10 @@ public class BacktraceGsonBuilder implements CustomGsonBuilder {
 
     @Override
     public Gson buildGson() {
-        return new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES).create();
+        return new GsonBuilder()
+                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
+                .registerTypeAdapter(StackTraceElement.class, new StackTraceElementTypeAdapter())
+                .registerTypeAdapterFactory(new ThrowableTypeAdapterFactory())
+                .create();
     }
 }

backtrace-library/src/main/java/backtraceio/library/common/serialization/BacktraceGsonBuilder.java

@@ -0,0 +1,67 @@
+package backtraceio.library.common.serialization;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+
+public class StackTraceElementTypeAdapter extends TypeAdapter<StackTraceElement> {
+
+    @Override
+    public void write(JsonWriter out, StackTraceElement value) throws IOException {
+        if (value == null) {
+            out.nullValue();
+            return;
+        }
+        out.beginObject();
+        out.name("declaring-class").value(value.getClassName());
+        out.name("method-name").value(value.getMethodName());
+        out.name("file-name").value(value.getFileName());
+        out.name("line-number").value(value.getLineNumber());
+        // Do NOT write classLoaderName (for compatibility)
+        out.endObject();
+    }
+
+    @Override
+    public StackTraceElement read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+            in.nextNull();
+            return null;
+        }
+        String className = null;
+        String methodName = null;
+        String fileName = null;
+        int lineNumber = -1;
+
+        in.beginObject();
+        while (in.hasNext()) {
+            String name = in.nextName();
+            switch (name) {
+                case "declaring-class":
+                    className = in.nextString();
+                    break;
+                case "method-name":
+                    methodName = in.nextString();
+                    break;
+                case "file-name":
+                    if (in.peek() == JsonToken.NULL) {
+                        in.nextNull();
+                        fileName = null;
+                    } else {
+                        fileName = in.nextString();
+                    }
+                    break;
+                case "line-number":
+                    lineNumber = in.nextInt();
+                    break;
+                // Ignore any unknown fields (including classLoaderName)
+                default:
+                    in.skipValue();
+            }
+        }
+        in.endObject();
+        return new StackTraceElement(className, methodName, fileName, lineNumber);
+    }
+}