github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide the NDK warning that should never happen with a regexp (#14503)

Browse Source
This commit is contained in:
jcollins-g 2018-02-08 12:16:04 -08:00 committed by GitHub
parent 225b52bc0e
commit 7982694a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/flutter_tools/lib/src/android/gradle.dart
View File

@ -36,6 +36,14 @@ enum FlutterPluginVersion {
managed, managed,
} }
// Investigation documented in #13975 suggests the filter should be a subset
// of the impact of -q, but users insist they see the error message sometimes
// anyway. If we can prove it really is impossible, delete the filter.
final RegExp ndkMessageFilter = new RegExp(r'^(?!NDK is missing a ".*" directory'
r'|If you are not using NDK, unset the NDK variable from ANDROID_NDK_HOME or local.properties to remove this warning'
r'|If you are using NDK, verify the ndk.dir is set to a valid NDK directory. It is currently set to .*)');
bool isProjectUsingGradle() { bool isProjectUsingGradle() {
return fs.isFileSync('android/build.gradle'); return fs.isFileSync('android/build.gradle');
} }
@ -309,6 +317,7 @@ Future<Null> _buildGradleProjectV2(String gradle, BuildInfo buildInfo, String ta
workingDirectory: 'android', workingDirectory: 'android',
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: _gradleEnv, environment: _gradleEnv,
filter: logger.isVerbose ? null : ndkMessageFilter,
); );
status.stop(); status.stop();

22
packages/flutter_tools/test/android/gradle_test.dart
View File

@ -8,6 +8,28 @@ import 'package:flutter_tools/src/build_info.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
void main() { void main() {
group('gradle build', () {
test('regexp should only match lines without the error message', () {
final List<String> nonMatchingLines = <String>[
'NDK is missing a "platforms" directory.',
'If you are using NDK, verify the ndk.dir is set to a valid NDK directory. It is currently set to /usr/local/company/home/username/Android/Sdk/ndk-bundle.',
'If you are not using NDK, unset the NDK variable from ANDROID_NDK_HOME or local.properties to remove this warning.',
];
final List<String> matchingLines = <String>[
':app:preBuild UP-TO-DATE',
'BUILD SUCCESSFUL in 0s',
'',
'Something NDK related mentioning ANDROID_NDK_HOME',
];
for (String m in nonMatchingLines) {
expect(ndkMessageFilter.hasMatch(m), isFalse);
}
for (String m in matchingLines) {
expect(ndkMessageFilter.hasMatch(m), isTrue);
}
});
});
group('gradle project', () { group('gradle project', () {
GradleProject projectFrom(String properties) => new GradleProject.fromAppProperties(properties); GradleProject projectFrom(String properties) => new GradleProject.fromAppProperties(properties);