@@ -154,8 +154,6 @@ static const char* kSnapshotKindNames[] = {
154
154
V (save_obfuscation_map, obfuscation_map_filename)
155
155
156
156
#define BOOL_OPTIONS_LIST (V ) \
157
- V (dependencies_only, dependencies_only) \
158
- V (print_dependencies, print_dependencies) \
159
157
V (obfuscate, obfuscate) \
160
158
V (verbose, verbose) \
161
159
V (version, version) \
@@ -206,10 +204,6 @@ static void PrintUsage() {
206
204
" --dependencies=<output-file> \n "
207
205
" Generates a Makefile with snapshot output files as targets and all \n "
208
206
" transitive imports as sources. \n "
209
- " --print_dependencies \n "
210
- " Prints all transitive imports to stdout. \n "
211
- " --dependencies_only \n "
212
- " Don't create and output the snapshot. \n "
213
207
" --help \n "
214
208
" Display this message (add --verbose for information about all VM options).\n "
215
209
" --version \n "
@@ -705,33 +699,12 @@ static void CreateAndWriteDependenciesFile() {
705
699
706
700
Loader::ResolveDependenciesAsFilePaths ();
707
701
708
- ASSERT (( dependencies_filename != NULL ) || print_dependencies );
702
+ ASSERT (dependencies_filename != NULL );
709
703
if (dependencies_filename != NULL ) {
710
704
DependenciesFileWriter writer;
711
705
writer.WriteDependencies (dependencies);
712
706
}
713
707
714
- if (print_dependencies) {
715
- Log::Print (" %s\n " , vm_snapshot_data_filename);
716
- if (snapshot_kind == kScript ) {
717
- if (vm_snapshot_data_filename != NULL ) {
718
- Log::Print (" %s\n " , vm_snapshot_data_filename);
719
- }
720
- if (vm_snapshot_instructions_filename != NULL ) {
721
- Log::Print (" %s\n " , vm_snapshot_instructions_filename);
722
- }
723
- if (isolate_snapshot_data_filename != NULL ) {
724
- Log::Print (" %s\n " , isolate_snapshot_data_filename);
725
- }
726
- if (isolate_snapshot_instructions_filename != NULL ) {
727
- Log::Print (" %s\n " , isolate_snapshot_instructions_filename);
728
- }
729
- }
730
- for (intptr_t i = 0 ; i < dependencies->length (); i++) {
731
- Log::Print (" %s\n " , dependencies->At (i));
732
- }
733
- }
734
-
735
708
for (intptr_t i = 0 ; i < dependencies->length (); i++) {
736
709
free (dependencies->At (i));
737
710
}
@@ -1422,7 +1395,7 @@ static int GenerateSnapshotFromKernel(const uint8_t* kernel_buffer,
1422
1395
char * error = NULL ;
1423
1396
IsolateData* isolate_data = new IsolateData (NULL , commandline_package_root,
1424
1397
commandline_packages_file, NULL );
1425
- if (( dependencies_filename != NULL ) || print_dependencies ) {
1398
+ if (dependencies_filename != NULL ) {
1426
1399
isolate_data->set_dependencies (new MallocGrowableArray<char *>());
1427
1400
}
1428
1401
@@ -1552,8 +1525,7 @@ int main(int argc, char** argv) {
1552
1525
" Can only generate core or aot snapshots from a kernel file.\n " );
1553
1526
return kErrorExitCode ;
1554
1527
}
1555
- if ((dependencies_filename != NULL ) || print_dependencies ||
1556
- dependencies_only) {
1528
+ if (dependencies_filename != NULL ) {
1557
1529
Log::PrintErr (" Depfiles are not supported in Dart 2.\n " );
1558
1530
return kErrorExitCode ;
1559
1531
}
@@ -1718,7 +1690,7 @@ int main(int argc, char** argv) {
1718
1690
// be in the snapshot.
1719
1691
isolate_data = new IsolateData (app_script_name, commandline_package_root,
1720
1692
commandline_packages_file, NULL );
1721
- if (( dependencies_filename != NULL ) || print_dependencies ) {
1693
+ if (dependencies_filename != NULL ) {
1722
1694
isolate_data->set_dependencies (new MallocGrowableArray<char *>());
1723
1695
}
1724
1696
@@ -1768,24 +1740,22 @@ int main(int argc, char** argv) {
1768
1740
1769
1741
LoadCompilationTrace ();
1770
1742
1771
- if (!dependencies_only) {
1772
- switch (snapshot_kind) {
1773
- case kCore :
1774
- CreateAndWriteCoreSnapshot ();
1775
- break ;
1776
- case kCoreJIT :
1777
- CreateAndWriteCoreJITSnapshot ();
1778
- break ;
1779
- case kScript :
1780
- CreateAndWriteScriptSnapshot ();
1781
- break ;
1782
- case kAppAOTBlobs :
1783
- case kAppAOTAssembly :
1784
- CreateAndWritePrecompiledSnapshot (entry_points);
1785
- break ;
1786
- default :
1787
- UNREACHABLE ();
1788
- }
1743
+ switch (snapshot_kind) {
1744
+ case kCore :
1745
+ CreateAndWriteCoreSnapshot ();
1746
+ break ;
1747
+ case kCoreJIT :
1748
+ CreateAndWriteCoreJITSnapshot ();
1749
+ break ;
1750
+ case kScript :
1751
+ CreateAndWriteScriptSnapshot ();
1752
+ break ;
1753
+ case kAppAOTBlobs :
1754
+ case kAppAOTAssembly :
1755
+ CreateAndWritePrecompiledSnapshot (entry_points);
1756
+ break ;
1757
+ default :
1758
+ UNREACHABLE ();
1789
1759
}
1790
1760
1791
1761
CreateAndWriteDependenciesFile ();
0 commit comments