diff --git a/.ci.yaml b/.ci.yaml index 4135d40e8d0..897e4e57f13 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -356,6 +356,27 @@ targets: task_name: android_views timeout: 60 + - name: Linux build_aar_module_test + bringup: true + recipe: devicelab/devicelab_drone + timeout: 60 + properties: + add_recipes_cq: "true" + dependencies: >- + [ + {"dependency": "android_sdk", "version": "version:34v3"}, + {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}, + {"dependency": "open_jdk", "version": "version:17"} + ] + tags: > + ["devicelab","hostonly"] + task_name: build_aar_module_test + runIf: + - dev/** + - packages/flutter_tools/** + - bin/** + - .ci.yaml + - name: Linux build_tests_1_3 recipe: flutter/flutter_drone timeout: 60 diff --git a/dev/devicelab/bin/tasks/build_aar_module_test.dart b/dev/devicelab/bin/tasks/build_aar_module_test.dart index ed9988c6baa..f493bd26821 100644 --- a/dev/devicelab/bin/tasks/build_aar_module_test.dart +++ b/dev/devicelab/bin/tasks/build_aar_module_test.dart @@ -65,7 +65,6 @@ Future main() async { ' path: ../plugin_with_android$platformLineSep' ' plugin_without_android:$platformLineSep' ' path: ../plugin_without_android$platformLineSep' - ' webcrypto: 0.5.2$platformLineSep', // Plugin that uses NDK. ); modulePubspec.writeAsStringSync(content, flush: true); diff --git a/packages/flutter_tools/gradle/aar_init_script.gradle b/packages/flutter_tools/gradle/aar_init_script.gradle index e6fa84cc17f..aa6bac1a39e 100644 --- a/packages/flutter_tools/gradle/aar_init_script.gradle +++ b/packages/flutter_tools/gradle/aar_init_script.gradle @@ -116,6 +116,39 @@ allprojects { apply plugin: "maven-publish" } +afterProject { project -> + // Exit early if either: + // 1. The project doesn't have the Android Gradle plugin applied. + // 2. The project has already defined which variants to publish (trying to re-define which + // variants to publish will result in an error). + if (!project.hasProperty("android")) { + return + } + if (project.android.publishing.singleVariants.size() != 0) { + return + } + + Closure addSingleVariants = {buildType -> + if (!project.android.productFlavors.isEmpty()) { + project.android.productFlavors.all{productFlavor -> + project.android.publishing.singleVariant( + productFlavor.name + buildType.name.capitalize() + ) { + withSourcesJar() + withJavadocJar() + } + } + } else { + project.android.publishing.singleVariant(buildType.name) { + withSourcesJar() + withJavadocJar() + } + } + } + + project.android.buildTypes.all(addSingleVariants) +} + projectsEvaluated { assert rootProject.hasProperty("is-plugin") if (rootProject.property("is-plugin").toBoolean()) { diff --git a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl index c9e3dc7d3e0..3181f8a012f 100644 --- a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl @@ -51,6 +51,7 @@ android { } } + flutter { source = "../.." }