zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Ensure that different formatting of ndk properties file does not crash tool (#29528)

Browse Source
This commit is contained in:
Jonah Williams
2019-03-18 10:51:24 -07:00
committed by GitHub
parent bd697d4b5a
commit 75c50da5f6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter_tools/lib/src/android/android_sdk.dart
View File

@@ -216,10 +216,15 @@ class AndroidNdk {
.split('\n')
.map<String>((String line) => line.trim())
.where((String line) => line.isNotEmpty);
final Map<String, String> properties = Map<String, String>.fromIterable(
propertiesFileLines.map<List<String>>((String line) => line.split(' = ')),
key: (dynamic split) => split[0],
value: (dynamic split) => split[1]);
final Map<String, String> properties = <String, String>{};
for (String line in propertiesFileLines) {
final List<String> parts = line.split(' = ');
if (parts.length == 2) {
properties[parts[0]] = parts[1];
} else {
printError('Malformed line in ndk source.properties: "$line".');
}
}
if (!properties.containsKey('Pkg.Revision')) {
throw AndroidNdkSearchError('Can not establish ndk-bundle version: $propertiesFile does not contain Pkg.Revision');