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

remove fallback code for ios/usb artifacts (#39585)

Browse Source
This commit is contained in:
Christopher Fujino 2019-09-06 14:23:20 -07:00 committed by GitHub
parent b2da79ce98
commit f945079c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter_tools/lib/src/ios/devices.dart
View File

@ -39,14 +39,8 @@ class IOSDeploy {
@required List<String> launchArguments,
}) async {
final String iosDeployPath = artifacts.getArtifactPath(Artifact.iosDeploy, platform: TargetPlatform.ios);
// TODO(fujino): remove fallback once g3 updated
const List<String> fallbackIosDeployPath = <String>[
'/usr/bin/env',
'ios-deploy',
];
final List<String> commandList = iosDeployPath != null ? <String>[iosDeployPath] : fallbackIosDeployPath;
final List<String> launchCommand = <String>[
...commandList,
iosDeployPath,
'--id',
deviceId,
'--bundle',
@ -135,11 +129,11 @@ class IOSDevice extends Device {
_installerPath = artifacts.getArtifactPath(
Artifact.ideviceinstaller,
platform: TargetPlatform.ios,
) ?? 'ideviceinstaller'; // TODO(fujino): remove fallback once g3 updated
);
_iproxyPath = artifacts.getArtifactPath(
Artifact.iproxy,
platform: TargetPlatform.ios
) ?? 'iproxy'; // TODO(fujino): remove fallback once g3 updated
);
}
String _installerPath;

17
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -94,17 +94,12 @@ class LockdownReturnCode {
class IMobileDevice {
IMobileDevice()
: _ideviceIdPath = artifacts.getArtifactPath(Artifact.ideviceId, platform: TargetPlatform.ios)
?? 'idevice_id', // TODO(fujino): remove fallback once g3 updated
_ideviceinfoPath = artifacts.getArtifactPath(Artifact.ideviceinfo, platform: TargetPlatform.ios)
?? 'ideviceinfo', // TODO(fujino): remove fallback once g3 updated
_idevicenamePath = artifacts.getArtifactPath(Artifact.idevicename, platform: TargetPlatform.ios)
?? 'idevicename', // TODO(fujino): remove fallback once g3 updated
_idevicesyslogPath = artifacts.getArtifactPath(Artifact.idevicesyslog, platform: TargetPlatform.ios)
?? 'idevicesyslog', // TODO(fujino): remove fallback once g3 updated
_idevicescreenshotPath = artifacts.getArtifactPath(Artifact.idevicescreenshot, platform: TargetPlatform.ios)
?? 'idevicescreenshot' { // TODO(fujino): remove fallback once g3 updated
}
: _ideviceIdPath = artifacts.getArtifactPath(Artifact.ideviceId, platform: TargetPlatform.ios),
_ideviceinfoPath = artifacts.getArtifactPath(Artifact.ideviceinfo, platform: TargetPlatform.ios),
_idevicenamePath = artifacts.getArtifactPath(Artifact.idevicename, platform: TargetPlatform.ios),
_idevicesyslogPath = artifacts.getArtifactPath(Artifact.idevicesyslog, platform: TargetPlatform.ios),
_idevicescreenshotPath = artifacts.getArtifactPath(Artifact.idevicescreenshot, platform: TargetPlatform.ios);
final String _ideviceIdPath;
final String _ideviceinfoPath;
final String _idevicenamePath;