Fixes for android CI tests (#2713)

### Description of changes: 
Fixed failing Android CI tests.

### Call-outs:
The fix requires a Docker image update so devicefarm will still fail on
this PR. I have verified that the test passed in my personal account.
See test result for this
[commit](https://github.com/nhatnghiho/aws-lc/commits/a9d3dff8b25e82d3fe43d67951536ffee91e94e6)

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and the ISC license.

---------

Co-authored-by: Justin Smith <justsmth@amazon.com>

Author: nhatnghiho

tests/ci/android/AWSLCAndroidTestRunner/app/build.gradle

@@ -1,11 +1,13 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-    ndkVersion "21.4.7075529"
+    namespace 'software.amazon.aws.crypto.awslcandroidtestrunner'
+    compileSdk 30
+    buildToolsVersion "33.0.3"
+    ndkVersion "28.2.13676358"
 
     def cmake_args = ''
     def specific_abis = ''
@@ -50,16 +52,19 @@ android {
 
     defaultConfig {
         applicationId "software.amazon.aws.crypto.awslcandroidtestrunner"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {
             cmake {
-                arguments cmake_args.split(',')
+                if (!cmake_args.isEmpty()) {
+                    arguments cmake_args.split(',')
+                }
+                targets "all_tests"
                 abiFilters specific_abis.split(',')
             }
         }
@@ -87,10 +92,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:monitor:1.2.0@aar'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:core:1.4.0'
 }

tests/ci/android/AWSLCAndroidTestRunner/app/src/main/cpp/CMakeLists.txt

@@ -3,11 +3,10 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10)
 
 # AWS lib
-set(path_to_awslc "${CMAKE_CURRENT_LIST_DIR}/../../../../../../../../")
-get_filename_component(path_to_awslc ${path_to_awslc} ABSOLUTE)
+get_filename_component(path_to_awslc "${CMAKE_CURRENT_LIST_DIR}/../../../../../../../../" REALPATH)
 
 list(APPEND CMAKE_MODULE_PATH $<TARGET_FILE:crypto>)
 set(ANDROIDTESTRUNNER ON)
@@ -22,15 +21,14 @@ list(APPEND ANDROID_TEST_CASES "crypto_test")
 list(APPEND ANDROID_TEST_CASES "urandom_test")
 list(APPEND ANDROID_TEST_CASES "ssl_test")
 
+
 # Generate Kotlin test classes
-get_filename_component(testrunner_path "../../androidTest/java/software/amazon/aws/crypto/awslcandroidtestrunner" ABSOLUTE)
+get_filename_component(testrunner_path "../../androidTest/java/software/amazon/aws/crypto/awslcandroidtestrunner" REALPATH)
 foreach(name IN LISTS ANDROID_TEST_CASES)
     set(TEST_NAME "${name}")
     configure_file(
         "${testrunner_path}/NativeTest.kt.in"
         "${testrunner_path}/tests/NativeTest_${name}.kt"
         @ONLY
     )
-endforeach() 
-
-
+endforeach()

tests/ci/android/AWSLCAndroidTestRunner/build.gradle

@@ -1,26 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
-    ext.kotlin_version = '1.3.71'
-    repositories {
-        google()
-        jcenter()
-        
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+plugins {
+    id 'com.android.application' version '7.3.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.5.31' apply false
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
-        
+        mavenCentral()
     }
 }
 

tests/ci/android/AWSLCAndroidTestRunner/gradle/wrapper/gradle-wrapper.properties

@@ -2,8 +2,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=file\:/opt/gradle-5.6.4-all.zip
+distributionUrl=file\:/opt/gradle-7.6.4-all.zip
 
 # Use version below when building outside of our android docker image and gradle
 # is not preinstalled.
-# distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+# distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip

tests/ci/android/AWSLCAndroidTestRunner/settings.gradle

@@ -1,2 +1,10 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name='AWSLCAndroidTestRunner'
-include ':app'
+include ':app'

tests/ci/android/README.md

@@ -6,7 +6,7 @@ Our android CI cross-compiles AWS-LC using AWSLCAndroidTestRunner and the NDK to
 ## Setup
 The commands below help build the app within our Android CI's docker image. The docker image is only made to support cross-compiling AWS-LC with Android toolchains, building the `AWSLCAndroidTestRunner` apks, and uploading and kicking off the tests in AWS Device Farm. Running and testing on connected Android devices or emulators via `./gradlew cC` isn't configured within the docker image.
 1. Assuming all the commands are being run from this folder: `cd tests/ci/android`
-2. `docker build -t ubuntu-20.04:android ../docker_images/linux-x86/ubuntu-24.04_android/`
+2. `docker build -t ubuntu-24.04:android ../docker_images/linux-x86/ubuntu-24.04_android/`
 3. Run the docker image from root of aws-lc. The container needs access to aws-lc's source code to build.
    ```
    cd ../../../

tests/ci/cdk/cdk/codebuild/github_ci_android_omnibus.yaml

@@ -6,43 +6,43 @@ version: 0.2
 # Doc for batch https://docs.aws.amazon.com/codebuild/latest/userguide/batch-build-buildspec.html#build-spec.batch.build-list
 batch:
   build-list:
-    - identifier: ubuntu2004_android_nonfips_static_debug
+    - identifier: ubuntu2404_android_nonfips_static_debug
       buildspec: ./tests/ci/codebuild/android/run_android_static_debug.yml
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
         compute-type: BUILD_GENERAL1_MEDIUM
         # TODO(CryptoAlg-1276): replace |620771051181| and |us-west-2| with corresponding env variables.
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-24.04_android_latest
-    - identifier: ubuntu2004_android_nonfips_static_release
+    - identifier: ubuntu2404_android_nonfips_static_release
       buildspec: ./tests/ci/codebuild/android/run_android_static_release.yml
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
         compute-type: BUILD_GENERAL1_MEDIUM
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-24.04_android_latest
-    - identifier: ubuntu2004_android_nonfips_shared_debug
+    - identifier: ubuntu2404_android_nonfips_shared_debug
       buildspec: ./tests/ci/codebuild/android/run_android_shared_debug.yml
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
         compute-type: BUILD_GENERAL1_MEDIUM
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-24.04_android_latest
-    - identifier: ubuntu2004_android_nonfips_shared_release
+    - identifier: ubuntu2404_android_nonfips_shared_release
       buildspec: ./tests/ci/codebuild/android/run_android_shared_release.yml
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
         compute-type: BUILD_GENERAL1_MEDIUM
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-24.04_android_latest
-    - identifier: ubuntu2004_android_fips_shared_release
+    - identifier: ubuntu2404_android_fips_shared_release
       buildspec: ./tests/ci/codebuild/android/run_android_fips_shared.yml
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
         compute-type: BUILD_GENERAL1_MEDIUM
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-24.04_android_latest
-    - identifier: ubuntu2004_android_fips_static_release
+    - identifier: ubuntu2404_android_fips_static_release
       buildspec: ./tests/ci/codebuild/android/run_android_fips_static.yml
       env:
         type: LINUX_CONTAINER

tests/ci/docker_images/linux-x86/ubuntu-24.04_android/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application' version '7.3.1'
-    id 'org.jetbrains.kotlin.android' version '1.8.10'
+    id 'org.jetbrains.kotlin.android' version '1.5.31'
 }
 
 allprojects {
@@ -26,10 +26,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:core:1.4.0'
 }

tests/ci/docker_images/linux-x86/ubuntu-24.04_android/gradle/wrapper/gradle-wrapper.properties

@@ -6,4 +6,4 @@ distributionUrl=file\:/opt/gradle-7.6.4-all.zip
 
 # Use version below when building outside of our android docker image and gradle
 # is not preinstalled.
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip