Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
512ea8f9
Unverified
Commit
512ea8f9
authored
Mar 25, 2021
by
Zachary Anderson
Committed by
GitHub
Mar 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] Remove reference to pm genkey and -k (#79047)
parent
f05c409a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
57 deletions
+10
-57
fuchsia_build.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
+2
-6
fuchsia_pm.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
+2
-19
build_fuchsia_test.dart
...ools/test/commands.shard/hermetic/build_fuchsia_test.dart
+2
-13
fuchsia_device_test.dart
...tools/test/general.shard/fuchsia/fuchsia_device_test.dart
+4
-19
No files found.
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
View file @
512ea8f9
...
...
@@ -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
;
}
}
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
View file @
512ea8f9
...
...
@@ -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'
,
...
...
packages/flutter_tools/test/commands.shard/hermetic/build_fuchsia_test.dart
View file @
512ea8f9
...
...
@@ -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
;
}
...
...
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
View file @
512ea8f9
...
...
@@ -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
{
return
false
;
}
@override
Future
<
bool
>
build
(
String
buildPath
,
String
keyPath
,
String
manifestPath
)
async
{
Future
<
bool
>
build
(
String
buildPath
,
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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment