diff --git a/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart b/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart index 85f28b75049..ddd685646be 100644 --- a/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart +++ b/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart @@ -214,17 +214,6 @@ class ModuleTest { return TaskResult.failure('Failed to build editable host .apk'); } - section('Flutter build aar succeeds'); - - await inDirectory(projectDir, () async { - await flutter( - 'build', - options: ['aar', '--no-profile'], - output: stdout, - stderr: stderr, - ); - }); - section('Add to existing Android app'); final Directory hostApp = Directory(path.join(tempDir.path, 'hello_host_app')); @@ -248,12 +237,13 @@ class ModuleTest { ); // Modify gradle version to the passed in version. + // This is somehow the wrong file. final File gradleWrapperProperties = File( path.join(hostApp.path, 'gradle', 'wrapper', 'gradle-wrapper.properties'), ); String propertyContent = await gradleWrapperProperties.readAsString(); propertyContent = propertyContent.replaceFirst('REPLACEME', gradleVersion); - section('Modify gradle wrapper file contents'); + section(propertyContent); await gradleWrapperProperties.writeAsString(propertyContent, flush: true); // Modify AGP version to the passed in version. diff --git a/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/app/build.gradle b/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/app/build.gradle index f21e519eb06..518a685691b 100644 --- a/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/app/build.gradle +++ b/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/app/build.gradle @@ -29,15 +29,8 @@ android { versionCode 1 versionName "1.0" } - buildTypes { - profile { - initWith debug - } - } } dependencies { - debugImplementation 'io.flutter.devicelab.hello:flutter_debug:1.0' - profileImplementation 'io.flutter.devicelab.hello:flutter_profile:1.0' - releaseImplementation 'io.flutter.devicelab.hello:flutter_release:1.0' + implementation project(':flutter') } diff --git a/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/settings.gradle b/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/settings.gradle index 28620d5e2b9..6c933debbaf 100644 --- a/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/settings.gradle +++ b/dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/settings.gradle @@ -2,18 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) - repositories { - google() - mavenCentral() - maven { - url = uri("https://storage.googleapis.com/download.flutter.io") - } - maven { - url = uri("../hello/build/host/outputs/repo") - } - } -} - include ':app' +setBinding(new Binding([gradle: this])) +evaluate(new File(settingsDir.parentFile, 'hello/.android/include_flutter.groovy'))