mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
<!-- start_original_pr_link --> Reverts: flutter/flutter#169171 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: gmackall <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: this is failing on presubmits of prs that make engine changes, presumably due to some missing gradle configuration to handle that special case in resolving the engine binaries. <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: gmackall <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {mboetger} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: Fixes https://github.com/flutter/flutter/issues/169165. `build_android_host_app_with_module_aar` was unfortunately not depending on the module as an aar, but as source (something we have a different test for, and something that you would not expect given the name of the test 🤦 ) ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
This commit is contained in:
parent
43b6bf67e9
commit
5fd7aa2ed7
@ -214,17 +214,6 @@ class ModuleTest {
|
|||||||
return TaskResult.failure('Failed to build editable host .apk');
|
return TaskResult.failure('Failed to build editable host .apk');
|
||||||
}
|
}
|
||||||
|
|
||||||
section('Flutter build aar succeeds');
|
|
||||||
|
|
||||||
await inDirectory(projectDir, () async {
|
|
||||||
await flutter(
|
|
||||||
'build',
|
|
||||||
options: <String>['aar', '--no-profile'],
|
|
||||||
output: stdout,
|
|
||||||
stderr: stderr,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
section('Add to existing Android app');
|
section('Add to existing Android app');
|
||||||
|
|
||||||
final Directory hostApp = Directory(path.join(tempDir.path, 'hello_host_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.
|
// Modify gradle version to the passed in version.
|
||||||
|
// This is somehow the wrong file.
|
||||||
final File gradleWrapperProperties = File(
|
final File gradleWrapperProperties = File(
|
||||||
path.join(hostApp.path, 'gradle', 'wrapper', 'gradle-wrapper.properties'),
|
path.join(hostApp.path, 'gradle', 'wrapper', 'gradle-wrapper.properties'),
|
||||||
);
|
);
|
||||||
String propertyContent = await gradleWrapperProperties.readAsString();
|
String propertyContent = await gradleWrapperProperties.readAsString();
|
||||||
propertyContent = propertyContent.replaceFirst('REPLACEME', gradleVersion);
|
propertyContent = propertyContent.replaceFirst('REPLACEME', gradleVersion);
|
||||||
section('Modify gradle wrapper file contents');
|
section(propertyContent);
|
||||||
await gradleWrapperProperties.writeAsString(propertyContent, flush: true);
|
await gradleWrapperProperties.writeAsString(propertyContent, flush: true);
|
||||||
|
|
||||||
// Modify AGP version to the passed in version.
|
// Modify AGP version to the passed in version.
|
||||||
|
@ -29,15 +29,8 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
buildTypes {
|
|
||||||
profile {
|
|
||||||
initWith debug
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
debugImplementation 'io.flutter.devicelab.hello:flutter_debug:1.0'
|
implementation project(':flutter')
|
||||||
profileImplementation 'io.flutter.devicelab.hello:flutter_profile:1.0'
|
|
||||||
releaseImplementation 'io.flutter.devicelab.hello:flutter_release:1.0'
|
|
||||||
}
|
}
|
||||||
|
@ -2,18 +2,6 @@
|
|||||||
// Use of this source code is governed by a BSD-style license that can be
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
// found in the LICENSE file.
|
// 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'
|
include ':app'
|
||||||
|
setBinding(new Binding([gradle: this]))
|
||||||
|
evaluate(new File(settingsDir.parentFile, 'hello/.android/include_flutter.groovy'))
|
||||||
|
Loading…
Reference in New Issue
Block a user