Commit ebd8078b authored by Devon Carew's avatar Devon Carew

two fixes for checked mode

parent 68f33d30
...@@ -439,7 +439,7 @@ bool _needsRebuild(String apkPath, String manifest) { ...@@ -439,7 +439,7 @@ bool _needsRebuild(String apkPath, String manifest) {
// Note: This list of dependencies is imperfect, but will do for now. We // Note: This list of dependencies is imperfect, but will do for now. We
// purposely don't include the .dart files, because we can load those // purposely don't include the .dart files, because we can load those
// over the network without needing to rebuild (at least on Android). // over the network without needing to rebuild (at least on Android).
List<FileStat> dependenciesStat = [ Iterable<FileStat> dependenciesStat = [
manifest, manifest,
_kFlutterManifestPath, _kFlutterManifestPath,
_kPackagesStatusPath _kPackagesStatusPath
......
...@@ -99,10 +99,12 @@ class _MaterialAsset extends _Asset { ...@@ -99,10 +99,12 @@ class _MaterialAsset extends _Asset {
} }
} }
List _generateValues(Map assetDescriptor, String key, List defaults) { Iterable/*<T>*/ _generateValues/*<T>*/(
if (assetDescriptor.containsKey(key)) Map/*<String, T>*/ assetDescriptor,
return [assetDescriptor[key]]; String key,
return defaults; Iterable/*<T>*/ defaults
) {
return assetDescriptor.containsKey(key) ? /*<T>*/[assetDescriptor[key]] : defaults;
} }
void _accumulateMaterialAssets(Map<_Asset, List<_Asset>> result, Map assetDescriptor, String assetBase) { void _accumulateMaterialAssets(Map<_Asset, List<_Asset>> result, Map assetDescriptor, String assetBase) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment