development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-03 15:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] Remove reference to pm genkey and -k (#79047)

Browse source
This commit is contained in:
Zachary Anderson 2021-03-25 14:51:45 -07:00 committed by GitHub
parent f05c409af2
commit 512ea8f9d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
View file

@ -185,7 +185,6 @@ Future<void> _buildPackage(
final String appName = fuchsiaProject.project.manifest.appName;
final String pkgassets = globals.fs.path.join(outDir, '${appName}_pkgassets');
final String packageManifest = globals.fs.path.join(pkgDir, 'package_manifest');
final String devKeyPath = globals.fs.path.join(pkgDir, 'development.key');
final Directory pkg = globals.fs.directory(pkgDir);
if (!pkg.existsSync()) {
@ -219,13 +218,10 @@ Future<void> _buildPackage(
if (!await fuchsiaPM.init(pkgDir, appName)) {
return;
}
if (!await fuchsiaPM.genkey(pkgDir, devKeyPath)) {
if (!await fuchsiaPM.build(pkgDir, packageManifest)) {
return;
}
if (!await fuchsiaPM.build(pkgDir, devKeyPath, packageManifest)) {
return;
}
if (!await fuchsiaPM.archive(pkgDir, devKeyPath, packageManifest)) {
if (!await fuchsiaPM.archive(pkgDir, packageManifest)) {
return;
}
}

21
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
View file

@ -33,19 +33,6 @@ class FuchsiaPM {
]);
}
/// Generates a new private key to be used to sign a Fuchsia package.
///
/// [buildPath] should be the same [buildPath] passed to [init].
Future<bool> genkey(String buildPath, String outKeyPath) {
return _runPMCommand(<String>[
'-o',
buildPath,
'-k',
outKeyPath,
'genkey',
]);
}
/// Updates, signs, and seals a Fuchsia package.
///
/// [buildPath] should be the same [buildPath] passed to [init].
@ -61,12 +48,10 @@ class FuchsiaPM {
///
/// where $APPNAME is the same [appName] passed to [init], and meta/package
/// is set up to be the file `meta/package` created by [init].
Future<bool> build(String buildPath, String keyPath, String manifestPath) {
Future<bool> build(String buildPath, String manifestPath) {
return _runPMCommand(<String>[
'-o',
buildPath,
'-k',
keyPath,
'-m',
manifestPath,
'build',
@ -80,12 +65,10 @@ class FuchsiaPM {
///
/// [buildPath] should be the same path passed to [init], and [manifestPath]
/// should be the same manifest passed to [build].
Future<bool> archive(String buildPath, String keyPath, String manifestPath) {
Future<bool> archive(String buildPath, String manifestPath) {
return _runPMCommand(<String>[
'-o',
buildPath,
'-k',
keyPath,
'-m',
manifestPath,
'archive',

15
packages/flutter_tools/test/commands.shard/hermetic/build_fuchsia_test.dart
View file

@ -189,18 +189,8 @@ class FakeFuchsiaPM extends Fake implements FuchsiaPM {
}
@override
Future<bool> genkey(String buildPath, String outKeyPath) async {
if (!fileSystem.file(fileSystem.path.join(buildPath, 'meta', 'package')).existsSync()) {
return false;
}
fileSystem.file(outKeyPath).createSync(recursive: true);
return true;
}
@override
Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
Future<bool> build(String buildPath, String manifestPath) async {
if (!fileSystem.file(fileSystem.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fileSystem.file(keyPath).existsSync() ||
!fileSystem.file(manifestPath).existsSync()) {
return false;
}
@ -209,9 +199,8 @@ class FakeFuchsiaPM extends Fake implements FuchsiaPM {
}
@override
Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
Future<bool> archive(String buildPath, String manifestPath) async {
if (!fileSystem.file(fileSystem.path.join(buildPath, 'meta', 'package')).existsSync() ||
!fileSystem.file(keyPath).existsSync() ||
!fileSystem.file(manifestPath).existsSync()) {
return false;
}

25
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
View file

@ -1523,18 +1523,8 @@ class FakeFuchsiaPM implements FuchsiaPM {
}
@override
Future<bool> genkey(String buildPath, String outKeyPath) async {
if (!globals.fs.file(globals.fs.path.join(buildPath, 'meta', 'package')).existsSync()) {
return false;
}
globals.fs.file(outKeyPath).createSync(recursive: true);
return true;
}
@override
Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
Future<bool> build(String buildPath, String manifestPath) async {
if (!globals.fs.file(globals.fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!globals.fs.file(keyPath).existsSync() ||
!globals.fs.file(manifestPath).existsSync()) {
return false;
}
@ -1543,9 +1533,8 @@ class FakeFuchsiaPM implements FuchsiaPM {
}
@override
Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
Future<bool> archive(String buildPath, String manifestPath) async {
if (!globals.fs.file(globals.fs.path.join(buildPath, 'meta', 'package')).existsSync() ||
!globals.fs.file(keyPath).existsSync() ||
!globals.fs.file(manifestPath).existsSync()) {
return false;
}
@ -1589,18 +1578,14 @@ class FailingPM implements FuchsiaPM {
return false;
}
@override
Future<bool> genkey(String buildPath, String outKeyPath) async {
Future<bool> build(String buildPath, String manifestPath) async {
return false;
}
@override
Future<bool> build(String buildPath, String keyPath, String manifestPath) async {
return false;
}
@override
Future<bool> archive(String buildPath, String keyPath, String manifestPath) async {
Future<bool> archive(String buildPath, String manifestPath) async {
return false;
}