Migrate the rest of the samples to the convention plugin.

bitmap-plasma/app/build.gradle

@@ -1,27 +1,15 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
-    defaultConfig.with {
+    namespace 'com.example.plasma'
+    defaultConfig {
         applicationId 'com.example.plasma'
-        minSdkVersion 14
-        targetSdkVersion 33
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                         'proguard-rules.pro'
-        }
     }
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    namespace 'com.example.plasma'
 }

build-logic/build.gradle.kts

@@ -28,6 +28,10 @@ gradlePlugin {
             id = "ndksamples.android.application"
             implementationClass = "com.android.ndk.samples.buildlogic.AndroidApplicationConventionPlugin"
         }
+        register("androidLibrary") {
+            id = "ndksamples.android.library"
+            implementationClass = "com.android.ndk.samples.buildlogic.AndroidLibraryConventionPlugin"
+        }
         register("kotlinAndroid") {
             id = "ndksamples.android.kotlin"
             implementationClass = "com.android.ndk.samples.buildlogic.KotlinConventionPlugin"

build-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt

@@ -0,0 +1,34 @@
+package com.android.ndk.samples.buildlogic
+
+import com.android.build.api.dsl.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+            }
+
+            extensions.configure<LibraryExtension> {
+                compileSdk = Versions.COMPILE_SDK
+                ndkVersion = Versions.NDK
+                defaultConfig {
+                    minSdk = Versions.MIN_SDK
+                    lint {
+                        targetSdk = Versions.TARGET_SDK
+                    }
+                    testOptions {
+                        targetSdk = Versions.TARGET_SDK
+                    }
+                }
+                compileOptions {
+                    sourceCompatibility = Versions.JAVA
+                    targetCompatibility = Versions.JAVA
+                }
+            }
+        }
+    }
+}

camera/basic/build.gradle

@@ -1,40 +1,25 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
+    namespace 'com.sample.camera.basic'
     defaultConfig {
         applicationId 'com.sample.camera.basic'
         minSdkVersion  24
-        targetSdkVersion 33
-        ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-        }
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'
             }
         }
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                        'proguard-rules.pro'
-        }
-    }
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    namespace 'com.sample.camera.basic'
 }
 
 dependencies {
-    implementation fileTree(dir:'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation libs.appcompat
 }

camera/texture-view/build.gradle

@@ -1,15 +1,12 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
+    namespace 'com.sample.textureview'
     defaultConfig {
         applicationId "com.sample.textureview"
         minSdkVersion 24
-        targetSdkVersion 33
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'
@@ -22,18 +19,8 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-rules.txt'
-        }
-    }
-    namespace 'com.sample.textureview'
-
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.9.0'
+    implementation libs.androidx.core
 }

display-p3/image-view/build.gradle

@@ -1,37 +1,29 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
+    namespace 'com.example.widecolor'
     defaultConfig {
         applicationId = 'com.example.widecolor'
+        // p3_passthrough_ext starts from Android-29
+        // it could be lowered to Android-26, from which p3_ext started
+        // TODO: Make the sample degrade gracefully on older API levels, reduce to 24 or 21.
         minSdkVersion   29
-        targetSdkVersion 33  // p3_passthrough_ext starts from Android-29
-                             // it could be lowered to Android-26, from which p3_ext started
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-29'
             }
         }
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-rules.pro'
-        }
-    }
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    namespace 'com.example.widecolor'
 }
 
+// TODO: Vendor this into the tree.
 // download third_party libs: mathfu, stb
 List<String> TARGET_DIR = [projectDir.toString() + '/../third_party/mathfu',
                            projectDir.toString() + '/../third_party/stb']
@@ -53,5 +45,5 @@ for (int i = 0; i < TARGET_DIR.size(); i++) {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation libs.appcompat
 }

endless-tunnel/app/build.gradle

@@ -15,17 +15,13 @@
  */
 
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
+    namespace 'com.google.sample.tunnel'
     defaultConfig {
         applicationId 'com.google.sample.tunnel'
-        minSdkVersion 14
-        targetSdkVersion 33
         versionCode     1
         versionName    '1.0'
         externalNativeBuild {
@@ -34,21 +30,10 @@ android {
             }
         }
     }
-    buildTypes {
-        release {
-            minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-rules.pro'
-        }
-    }
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    lint {
-        abortOnError false
-    }
-    namespace 'com.google.sample.tunnel'
 }
 

gles3jni/app/build.gradle

@@ -1,36 +1,22 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
-def platformVersion = 24      // openGLES 3.2 min api level
-// def platformVersion = 18    //openGLES 3 min api level
-// def platformVersion = 12    //openGLES 2 min api level
-
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
+    namespace 'com.android.gles3jni'
 
     defaultConfig {
         applicationId 'com.android.gles3jni'
-        minSdkVersion "${platformVersion}"
-        targetSdkVersion 33
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'
             }
         }
     }
-    buildTypes {
-        release {
-            minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-rules.pro'
-        }
-    }
+
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    namespace 'com.android.gles3jni'
 }

gradle/libs.versions.toml

@@ -1,22 +1,42 @@
 [versions]
 agp = "8.4.0"
 kotlin = "1.7.21"
+kotlinxCoroutines = "1.6.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 androidxConstraintLayout = "2.1.4"
+androidxCore = "1.9.0"
+androidxGames = "2.1.0-alpha01"
+androidxJUnitGTest = "1.0.0-alpha01"
 appcompat = "1.6.1"
 material = "1.12.0"
 jetbrainsKotlinJvm = "1.7.21"
+oboe = "1.6.1"
+
+curl = "7.79.1-beta-1"
+googletest = "1.11.0-beta-1"
+jsoncpp = "1.9.5-beta-1"
+openssl = "1.1.1l-beta-1"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintLayout" }
+androidx-core = { group = "androidx.core", name = "core", version.ref = "androidxCore" }
+androidx-games-gameactivity = { group = "androidx.games", name = "games-activity", version.ref = "androidxGames" }
+androidx-junit-gtest = { group = "androidx.test.ext", name = "junit-gtest", version.ref = "androidxJUnitGTest" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+oboe = { group = "com.google.oboe", name = "oboe", version.ref = "oboe" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
+curl = { group = "com.android.ndk.thirdparty", name = "curl", version.ref = "curl" }
+googletest = { group = "com.android.ndk.thirdparty", name = "googletest", version.ref = "googletest" }
+jsoncpp = { group = "com.android.ndk.thirdparty", name = "jsoncpp", version.ref = "jsoncpp" }
+openssl = { group = "com.android.ndk.thirdparty", name = "openssl", version.ref = "openssl" }
 
 # build-logic dependencies
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }

hello-gl2/app/build.gradle

@@ -1,15 +1,12 @@
 plugins {
-    id 'com.android.application'
+    id "ndksamples.android.application"
 }
 
 android {
-    compileSdk 33
-    ndkVersion '25.1.8937393'
-
+    namespace 'com.android.gl2jni'
+
     defaultConfig {
         applicationId 'com.android.gl2jni'
-        minSdkVersion 14
-        targetSdkVersion 33
         externalNativeBuild {
             cmake {
                 // Available arguments are inside ${SDK}/cmake/.../android.toolchain.cmake file
@@ -18,18 +15,9 @@ android {
         }
     }
 
-    buildTypes {
-        release {
-            minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-rules.pro'
-        }
-    }
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    namespace 'com.android.gl2jni'
 }
-