Update Android build setup (#1228)

SaschaWillems · gpx1000 · web-flow · commit 04f03b32b860 · 2024-12-16T07:42:26.000-08:00
* Update fmd and spdlog third party modules to a recent combination that compiles on Android Should also fix #912 * Update validation layers for Android builds to 1.3.296 * Updated Android build files to work latest Android tooling * Replace ALooper_pollAll with ALooper_pollOnce Use of ALooper_pollAll has been deprecated on current Android versions * Remove package from Android manifest This has been deprecated with recent Android version Package name now comes from gradle setup * Update Android build instructions * Update gradle to 8.9 * Change gradle distribution url * Fix VVL download script Had a wrong "release only"dependency * adb spelling It's lower case on all platforms, upper case only works properly on windows * Trying to fix those annoying quality checks * Update Java version for Android CI builds * Android JDK setup * Revert adb name change * bump versions for Android and fix a few things. * Github CI has NDK 27 installed but not yet 28. It doesn't make a difference to Vulkan Samples, so downgrading for CI purposes is a good idea. * Update the JDK that github is using. * Update wording on required Android Studio version. --------- Co-authored-by: swinston <steve@holochip.com>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -146,11 +146,11 @@ jobs:
         with:
           submodules: "recursive"
 
-      - name: set up JDK 11
-        uses: actions/setup-java@v3
+      - name: set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: "11"
-          distribution: "temurin"
+          java-version: "21"
+          distribution: "zulu"
           cache: gradle
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.9
diff --git a/app/android/AndroidManifest.xml b/app/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-- Copyright (c) 2019-2023, Arm Limited and Contributors
+- Copyright (c) 2019-2024, Arm Limited and Contributors
 -
 - SPDX-License-Identifier: Apache-2.0
 -
@@ -19,12 +19,10 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="com.khronos.vulkan_samples"
 	android:versionCode="1"
 	android:versionName="1.0">
 
 	<application android:label="@string/app_name"
-		android:allowBackup="false"
 		android:debuggable="true"
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/bldsys/cmake/android_sync_folder.cmake b/bldsys/cmake/android_sync_folder.cmake
@@ -1,5 +1,5 @@
 #[[
- Copyright (c) 2019-2023, Arm Limited and Contributors
+ Copyright (c) 2019-2024, Arm Limited and Contributors
 
  SPDX-License-Identifier: Apache-2.0
 
diff --git a/bldsys/cmake/template/gradle/app.build.gradle.in b/bldsys/cmake/template/gradle/app.build.gradle.in
@@ -2,18 +2,18 @@ plugins {
 	id 'com.android.application'
 }
 
-ext.vvl_version='1.3.275.0'
+ext.vvl_version='1.3.296.0'
 apply from: "./download_vvl.gradle"
 
 android {
-	compileSdk 33
-	buildToolsVersion "33.0.0"
-	ndkVersion "25.2.9519653"
+	ndkVersion '27.2.12479018'
+	compileSdk 35
 
 	defaultConfig {
-		applicationId "com.khronos.vulkan_samples"
+		applicationId 'com.khronos.vulkan_samples'
+	namespace "com.khronos.vulkan_samples"
 		@MIN_SDK_VERSION@
-		targetSdk 33
+		targetSdk 35
 		versionCode 1
 		versionName "1.0"
 
@@ -43,8 +43,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_21
+		targetCompatibility JavaVersion.VERSION_21
 	}
 
 	sourceSets {
@@ -64,21 +64,21 @@ android {
 		}
 	}
 
-	lintOptions {
-		checkReleaseBuilds false
+	lint {
 		abortOnError false
+		checkReleaseBuilds false
 	}
-
+	
 	buildFeatures {
 		viewBinding true
 		prefab true
 	}
 }
 
 dependencies {
-	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'com.google.android.material:material:1.8.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-	implementation 'androidx.core:core:1.9.0'
-	implementation 'androidx.games:games-activity:2.0.0'
+	implementation 'androidx.appcompat:appcompat:1.7.0'
+	implementation 'com.google.android.material:material:1.12.0'
+	implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+	implementation 'androidx.core:core:1.15.0'
+	implementation 'androidx.games:games-activity:3.0.5'
 }
diff --git a/bldsys/cmake/template/gradle/build.gradle.in b/bldsys/cmake/template/gradle/build.gradle.in
@@ -1,8 +1,8 @@
 plugins {
-	id 'com.android.application' version '7.4.2' apply false
-	id 'com.android.library' version '7.4.2' apply false
+	id 'com.android.application' version '8.7.2' apply false
+	id 'com.android.library' version '8.7.2' apply false
 }
 
-task clean(type: Delete) {
-	delete rootProject.buildDir
+tasks.register('clean', Delete) {
+	delete rootProject.layout.buildDirectory
 }
diff --git a/bldsys/cmake/template/gradle/download_vvl.gradle b/bldsys/cmake/template/gradle/download_vvl.gradle
@@ -36,7 +36,7 @@ apply plugin: 'com.android.application'
  */
 
 // get the validation layer version.
-def VVL_VER = "1.3.275.0"
+def VVL_VER = "1.3.296.0"
 if (ext.has("vvl_version")) {
     VVL_VER = ext.vvl_version
 }
@@ -76,5 +76,6 @@ dependencies {
 }
 
 project.afterEvaluate{
+    project.getTasks().getByName("mergeDebugJniLibFolders").dependsOn(unzip)
     project.getTasks().getByName("mergeReleaseJniLibFolders").dependsOn(unzip)
 }
diff --git a/bldsys/cmake/template/gradle/gradle-wrapper.jar b/bldsys/cmake/template/gradle/gradle-wrapper.jar
diff --git a/bldsys/cmake/template/gradle/gradle-wrapper.properties.in b/bldsys/cmake/template/gradle/gradle-wrapper.properties.in
@@ -1,5 +1,5 @@
 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-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bldsys/cmake/template/gradle/gradlew b/bldsys/cmake/template/gradle/gradlew
diff --git a/bldsys/cmake/template/gradle/gradlew.bat b/bldsys/cmake/template/gradle/gradlew.bat
diff --git a/docs/build.adoc b/docs/build.adoc
@@ -363,9 +363,12 @@ ____
 We use this environment in the CI https://github.com/KhronosGroupActions/android-ndk-build[Android NDK Repository]
 ____
 
-It is highly recommended to install https://d.android.com/studio[Android Studio] to build, run and trace the sample project.
-Android Studio uses the following plugins/tools to build samples:
+=== Android Studio (Recommended)
+
+It is highly recommended to install https://d.android.com/studio[Android Studio] to build, run and trace the sample project. Building via Android Studio requires at least Ladybug 2024.2.1.
 
+Android Studio uses the following plugins/tools to build samples:
+ 
 * Android Gradle Plugin
 * CMake Plugin, which installs and uses Ninja
 * NDK
diff --git a/framework/platform/android/android_platform.h b/framework/platform/android/android_platform.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -81,8 +81,7 @@ inline bool process_android_events(android_app *app)
 	int ident;
 	int events;
 
-	while ((ident = ALooper_pollAll(0, nullptr, &events,
-	                                (void **) &source)) >= 0)
+	while ((ident = ALooper_pollOnce(0, nullptr, &events, (void **) &source)) > ALOOPER_POLL_TIMEOUT)
 	{
 		if (source)
 		{
diff --git a/third_party/fmt b/third_party/fmt
@@ -1 +1 @@
-Subproject commit dd6f657a79104101a2e4ea6ba90f69e0dc114822
+Subproject commit 0c9fce2ffefecfdce794e1859584e25877b7b592
diff --git a/third_party/spdlog b/third_party/spdlog
@@ -1 +1 @@
-Subproject commit 7e635fca68d014934b4af8a1cf874f63989352b7
+Subproject commit e593f6695c6065e6b345fe2862f04a519ed484e0

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`plugins {`
`2`		`- id 'com.android.application' version '7.4.2' apply false`
`3`		`- id 'com.android.library' version '7.4.2' apply false`
	`2`	`+ id 'com.android.application' version '8.7.2' apply false`
	`3`	`+ id 'com.android.library' version '8.7.2' apply false`
`4`	`4`	`}`
`5`	`5`
`6`		`-task clean(type: Delete) {`
`7`		`- delete rootProject.buildDir`
	`6`	`+tasks.register('clean', Delete) {`
	`7`	`+ delete rootProject.layout.buildDirectory`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ apply plugin: 'com.android.application'`
`36`	`36`	`*/`
`37`	`37`
`38`	`38`	`// get the validation layer version.`
`39`		`-def VVL_VER = "1.3.275.0"`
	`39`	`+def VVL_VER = "1.3.296.0"`
`40`	`40`	`if (ext.has("vvl_version")) {`
`41`	`41`	`VVL_VER = ext.vvl_version`
`42`	`42`	`}`
`@@ -76,5 +76,6 @@ dependencies {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`project.afterEvaluate{`
	`79`	`+ project.getTasks().getByName("mergeDebugJniLibFolders").dependsOn(unzip)`
`79`	`80`	`project.getTasks().getByName("mergeReleaseJniLibFolders").dependsOn(unzip)`
`80`	`81`	`}`