Commit d2ee6f78 authored by Todd Volkert's avatar Todd Volkert Committed by GitHub

Rename app.so -> app.dylib (#4522)

parent 09f458a5
...@@ -58,7 +58,7 @@ BuildApp() { ...@@ -58,7 +58,7 @@ BuildApp() {
AssertExists $derived_dir AssertExists $derived_dir
RunCommand rm -f ${derived_dir}/Flutter.framework RunCommand rm -f ${derived_dir}/Flutter.framework
RunCommand rm -f ${derived_dir}/app.so RunCommand rm -f ${derived_dir}/app.dylib
RunCommand rm -f ${derived_dir}/app.flx RunCommand rm -f ${derived_dir}/app.flx
RunCommand cp -r ${framework_path}/Flutter.framework ${derived_dir} RunCommand cp -r ${framework_path}/Flutter.framework ${derived_dir}
RunCommand pushd ${project_path} RunCommand pushd ${project_path}
...@@ -89,9 +89,9 @@ BuildApp() { ...@@ -89,9 +89,9 @@ BuildApp() {
exit -1 exit -1
fi fi
RunCommand cp build/aot/app.so ${derived_dir}/app.so RunCommand cp build/aot/app.dylib ${derived_dir}/app.dylib
else else
RunCommand eval "$(echo \"static const int Moo = 88;\" | xcrun clang -x c --shared -o ${derived_dir}/app.so -)" RunCommand eval "$(echo \"static const int Moo = 88;\" | xcrun clang -x c --shared -o ${derived_dir}/app.dylib -)"
fi fi
local precompilation_flag="" local precompilation_flag=""
......
...@@ -271,7 +271,7 @@ Future<String> _buildAotSnapshot( ...@@ -271,7 +271,7 @@ Future<String> _buildAotSnapshot(
// On iOS, we use Xcode to compile the snapshot into a dynamic library that the // On iOS, we use Xcode to compile the snapshot into a dynamic library that the
// end-developer can link into their app. // end-developer can link into their app.
if (platform == TargetPlatform.ios) { if (platform == TargetPlatform.ios) {
printStatus('Building app.so...'); printStatus('Building app.dylib...');
// These names are known to from the engine. // These names are known to from the engine.
const String kDartVmIsolateSnapshotBuffer = 'kDartVmIsolateSnapshotBuffer'; const String kDartVmIsolateSnapshotBuffer = 'kDartVmIsolateSnapshotBuffer';
...@@ -306,7 +306,7 @@ Future<String> _buildAotSnapshot( ...@@ -306,7 +306,7 @@ Future<String> _buildAotSnapshot(
..addAll(commonBuildOptions) ..addAll(commonBuildOptions)
..addAll(<String>['-c', kDartIsolateSnapshotBufferC, '-o', kDartIsolateSnapshotBufferO])); ..addAll(<String>['-c', kDartIsolateSnapshotBufferC, '-o', kDartIsolateSnapshotBufferO]));
String appSo = path.join(outputDir.path, 'app.so'); String appSo = path.join(outputDir.path, 'app.dylib');
List<String> linkCommand = <String>['xcrun', 'clang'] List<String> linkCommand = <String>['xcrun', 'clang']
..addAll(commonBuildOptions) ..addAll(commonBuildOptions)
...@@ -314,7 +314,7 @@ Future<String> _buildAotSnapshot( ...@@ -314,7 +314,7 @@ Future<String> _buildAotSnapshot(
'-dynamiclib', '-dynamiclib',
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks', '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks', '-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
'-install_name', '@rpath/app.so', '-install_name', '@rpath/app.dylib',
'-o', appSo, '-o', appSo,
kDartVmIsolateSnapshotBufferO, kDartVmIsolateSnapshotBufferO,
kDartIsolateSnapshotBufferO, kDartIsolateSnapshotBufferO,
......
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