Android 16 KB page sizes (#910)

Author: sbSteveK

.github/workflows/ci.yml

@@ -290,12 +290,54 @@ jobs:
       uses: actions/checkout@v4
       with:
           submodules: true
-    # Setup JDK 11
-    - name: set up JDK 11
+    # Setup JDK 17
+    - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
+    # Ensure Gradle uses this JDK (important when toolchains are present)
+    - name: Point Gradle at JDK 17
+      run: echo "ORG_GRADLE_JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+    
+    - name: Mirror ANDROID_HOME → ANDROID_SDK_ROOT
+      run: echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> "$GITHUB_ENV"
+    
+    # Install required Android components & accept licenses (NDK r28 + compileSdk 35)
+    - name: Install Android SDK packages
+      shell: bash
+      run: |
+        set -euo pipefail
+        SDKROOT="${ANDROID_SDK_ROOT:-$ANDROID_HOME}"
+        SDKMANAGER="$SDKROOT/cmdline-tools/latest/bin/sdkmanager"
+
+        # Some images have cmdline-tools already; ensure path exists
+        if [[ ! -x "$SDKMANAGER" ]]; then
+          echo "cmdline-tools not found; installing…"
+          mkdir -p "$SDKROOT/cmdline-tools"
+          curl -sSL -o /tmp/clt.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
+          sudo unzip -q /tmp/clt.zip -d "$SDKROOT/cmdline-tools"
+          sudo mv "$SDKROOT/cmdline-tools/cmdline-tools" "$SDKROOT/cmdline-tools/latest"
+          SDKMANAGER="$SDKROOT/cmdline-tools/latest/bin/sdkmanager"
+        fi
+
+        echo "Installing platform-tools, Build-Tools 35, platform android-35, NDK r28, and CMake…"
+        # Avoid 'yes' SIGPIPE killing the step: turn off pipefail just for these lines
+        set +o pipefail
+        yes | sudo "$SDKMANAGER" --install \
+          "platform-tools" \
+          "build-tools;35.0.0" \
+          "platforms;android-35" \
+          "ndk;28.0.12433566" \
+          "cmake;3.22.1"
+
+        yes | "$SDKMANAGER" --licenses
+        set -o pipefail
+
+        # Quick sanity prints (non-fatal)
+        "$SDKROOT/ndk/28.0.12433566/ndk-build" -v >/dev/null 2>&1 || true
+        "$SDKMANAGER" --list | sed -n '1,80p' || true
+
     # Build and publish locally for the test app to find the SNAPSHOT version
     - name: Build ${{ env.PACKAGE_NAME }}
       run: |
@@ -311,6 +353,22 @@ jobs:
         cd src/test/android/testapp/src/main/assets
         python3 -m pip install boto3
         python3 ./android_file_creation.py
+
+    - name: Set Android keystore home
+      run: |
+        echo "ANDROID_SDK_HOME=$GITHUB_WORKSPACE/.android-home" >> "$GITHUB_ENV"
+        echo "ANDROID_PREFS_ROOT=$GITHUB_WORKSPACE/.android-home" >> "$GITHUB_ENV"
+        mkdir -p "$GITHUB_WORKSPACE/.android-home/.android"
+
+    - name: Create debug keystore
+      run: |
+        keytool -genkeypair \
+          -keystore "$ANDROID_SDK_HOME/.android/debug.keystore" \
+          -storepass android -keypass android \
+          -alias androiddebugkey \
+          -dname "CN=Android Debug,O=Android,C=US" \
+          -keyalg RSA -keysize 2048 -validity 14000
+
     - name: Build Test App
       run: |
         cd src/test/android/testapp

android/ANDROID.md

@@ -28,12 +28,12 @@ cross-platform, high-performance, secure, and reliable.
 ## Installation
 
 ### Minimum requirements
-* Java 11+ ([Download and Install Java](https://www.java.com/en/download/help/download_options.html))
+* Java 17+ ([Download and Install Java](https://www.java.com/en/download/help/download_options.html))
   * [Set JAVA_HOME](#set-java_home)
-* Gradle 7.4.2 ([Download and Install Gradle](https://gradle.org/install/))
+* Gradle 8.5.1+ ([Download and Install Gradle](https://gradle.org/install/))
 * Android SDK 24 ([Doanload SDK Manager](https://developer.android.com/tools/releases/platform-tools#downloads))
   * [Set ANDROID_HOME](#set-android_home)
-* Android NDK ([Download and install Android NDK](https://developer.android.com/ndk/downloads))
+* Android NDK 28+ ([Download and install Android NDK](https://developer.android.com/ndk/downloads))
 
 ### Build and install CRT from source
 Supports API 24 or newer.

android/build.gradle

@@ -4,7 +4,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        // AGP 8.5.1+ aligns uncompressed .so at 16KB automatically
+        // Requires JDK 17+
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 

android/crt/build.gradle

@@ -43,8 +43,11 @@ ext {
 }
 
 android {
-    compileSdk 33
-    ndkVersion "21.4.7075529" // LTS version
+    namespace "software.amazon.awssdk.crt"
+
+    compileSdk 35
+    // Pin NDK r28+ (16KB alignment & removal of PAGE_SIZE macro are default)
+    ndkVersion "28.0.12433566"
 
     useLibrary 'android.test.runner'
     useLibrary 'android.test.base'
@@ -67,11 +70,32 @@ android {
 
         externalNativeBuild {
             cmake {
+                // If built on NDK r27 you need `-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON`
                 arguments "-DBUILD_DEPS=ON"
             }
         }
     }
 
+    buildFeatures {
+        // AGP 8 disables buildConfig generation by default. We set this to true
+        // to resstore BuildConfig.VERSION_NAME for both debug and release build types.
+        buildConfig true
+    }
+
+    packagingOptions {
+        jniLibs {
+            // Make sure JNI libs are packaged UNCOMPRESSED (so AGP can align them)
+            useLegacyPackaging false
+        }
+    }
+
+    publishing {
+        // Creates the 'release' SoftwareComponent used by maven-publish
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+
     sourceSets {
         main {
             java.srcDir '../../src/main/java'
@@ -163,8 +187,10 @@ afterEvaluate {
 
         publications {
             release(MavenPublication) {
-                from components.release
-
+                def comp = components.findByName("release")
+                if (comp != null) {
+                    from comp
+                }
                 groupId = 'software.amazon.awssdk.crt'
                 artifactId = 'aws-crt-android'
                 version = project.hasProperty('newVersion') ? project.property('newVersion') : android.defaultConfig.versionName

codebuild/cd/release-android-maven-central.yml

@@ -6,21 +6,33 @@ phases:
     commands:
       - sudo add-apt-repository ppa:openjdk-r/ppa
       - sudo apt-get update -y
-      - sudo apt-get install openjdk-11-jdk-headless maven wget unzip -y -f
+
+      # Java 17 for AGP 8.x
+      - sudo apt-get install -y openjdk-17-jdk-headless maven wget unzip gnupg
+      - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+      - export PATH="$JAVA_HOME/bin:$PATH"
+      - export ORG_GRADLE_JAVA_HOME="$JAVA_HOME"
+
       # install android sdk
-      - wget --quiet https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
       - export ANDROID_SDK_ROOT=$CODEBUILD_SRC_DIR/android-sdk
+      - export ANDROID_HOME="$ANDROID_SDK_ROOT"   # settings.gradle checks ANDROID_HOME
       - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
-      - unzip commandlinetools-linux-7583922_latest.zip -d $ANDROID_SDK_ROOT/cmdline-tools
+      - wget --quiet https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
+      - unzip -q commandlinetools-linux-11076708_latest.zip -d "$ANDROID_SDK_ROOT/cmdline-tools"
       # This weird path needed for cmd tool to work
-      - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
-      # install android build tools
-      - echo y | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "build-tools;30.0.3" "platforms;android-33" "ndk;21.4.7075529"
+      - mv "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools" "$ANDROID_SDK_ROOT/cmdline-tools/latest"
+      - export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH"
+
+      # Platform/Build-Tools for compileSdk 35, NDK r28, and CMake
+      - yes | sdkmanager --install "platform-tools" "build-tools;35.0.0" "platforms;android-35" "ndk;28.0.12433566" "cmake;3.22.1"
+      - yes | sdkmanager --licenses
+
   pre_build:
     commands:
       - cd $CODEBUILD_SRC_DIR/aws-crt-java
       - export PKG_VERSION=$(git describe --tags | cut -f2 -dv)
       - echo $PKG_VERSION
+
       # install settings.xml to ~/.m2/settings.xml
       - mkdir -p $HOME/.m2
       - aws s3 cp s3://code-sharing-aws-crt/aws-crt-java.settings.token.xml $HOME/.m2/settings.xml
@@ -37,6 +49,10 @@ phases:
       - sed -i 's|token-username|'"$ST_USERNAME"'|g' $HOME/.m2/settings.xml
       - sed -i 's|token-password|'"$ST_PASSWORD"'|g' $HOME/.m2/settings.xml
 
+      # Sanity prints
+      - java -version
+      - ./gradlew -v
+
   build:
     commands:
        # update the version to match the git tag, make a staging release which we will release once snapshot testing passes
@@ -48,6 +64,7 @@ phases:
 
   post_build:
     commands:
+      - echo "Build & publish steps completed."
 
 cache:
   paths:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Oct 16 16:47:56 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/android/testapp/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.5.0'
+    ext.kotlin_version = '1.9.24'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.1.2"
+        classpath "com.android.tools.build:gradle:8.5.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -22,8 +22,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    namespace "software.amazon.awssdk.crttest"
+
+    compileSdk 35
+    buildToolsVersion "35.0.0"
 
     useLibrary 'android.test.runner'
     useLibrary 'android.test.base'
@@ -32,14 +34,18 @@ android {
     defaultConfig {
         applicationId "software.amazon.awssdk.crttest"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
-        ndkVersion "23.1.7779620"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    // Ensure JNI libs from dependencies stay UNCOMPRESSED so AGP can 16KB-zip-align them
+    packagingOptions {
+        jniLibs { useLegacyPackaging false }
+    }
+
     sourceSets {
         main {
             java.srcDir 'src/main/java'
@@ -62,6 +68,11 @@ android {
     compileOptions {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
+        coreLibraryDesugaringEnabled true
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
 }
 
@@ -73,6 +84,7 @@ dependencies {
     implementation 'androidx.core:core:1.2.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 
     testImplementation 'junit:junit:4.13'
 
@@ -81,8 +93,8 @@ dependencies {
     implementation 'junit:junit:4.13'
     androidTestImplementation "junit:junit:4.13"
 
-    androidTestImplementation "androidx.test:core:1.2.0"
+    androidTestImplementation "androidx.test:core:1.5.0"
     androidTestImplementation "androidx.test:runner:1.5.2"
     androidTestImplementation "androidx.test:rules:1.5.0"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
 }

src/test/android/testapp/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="software.amazon.awssdk.crttest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -9,7 +8,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />