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
7aacff22
Unverified
Commit
7aacff22
authored
Dec 22, 2020
by
Jenn Magder
Committed by
GitHub
Dec 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Exclude ARM from macOS builds (#72748)
parent
f2536da1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
3 deletions
+12
-3
podhelper.rb
packages/flutter_tools/bin/podhelper.rb
+3
-0
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+4
-0
build_macos.dart
packages/flutter_tools/lib/src/macos/build_macos.dart
+0
-1
build_macos_test.dart
..._tools/test/commands.shard/hermetic/build_macos_test.dart
+1
-1
build_ios_config_only_test.dart
...ls/test/integration.shard/build_ios_config_only_test.dart
+4
-1
No files found.
packages/flutter_tools/bin/podhelper.rb
View file @
7aacff22
...
@@ -86,6 +86,9 @@ def flutter_additional_macos_build_settings(target)
...
@@ -86,6 +86,9 @@ def flutter_additional_macos_build_settings(target)
# Profile can't be derived from the CocoaPods build configuration. Use release framework (for linking only).
# Profile can't be derived from the CocoaPods build configuration. Use release framework (for linking only).
configuration_engine_dir
=
build_configuration
.
type
==
:debug
?
debug_framework_dir
:
release_framework_dir
configuration_engine_dir
=
build_configuration
.
type
==
:debug
?
debug_framework_dir
:
release_framework_dir
build_configuration
.
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
"
\"
#{
configuration_engine_dir
}
\"
$(inherited)"
build_configuration
.
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
"
\"
#{
configuration_engine_dir
}
\"
$(inherited)"
# ARM not yet supported https://github.com/flutter/flutter/issues/69221
build_configuration
.
build_settings
[
'EXCLUDED_ARCHS'
]
=
'arm64'
end
end
end
end
...
...
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
7aacff22
...
@@ -206,6 +206,10 @@ List<String> _xcodeBuildSettingsLines({
...
@@ -206,6 +206,10 @@ List<String> _xcodeBuildSettingsLines({
xcodeBuildSettings
.
add
(
'ARCHS=
$arch
'
);
xcodeBuildSettings
.
add
(
'ARCHS=
$arch
'
);
}
}
}
}
if
(
useMacOSConfig
)
{
// ARM not yet supported https://github.com/flutter/flutter/issues/69221
xcodeBuildSettings
.
add
(
'EXCLUDED_ARCHS=arm64'
);
}
for
(
final
MapEntry
<
String
,
String
>
config
in
buildInfo
.
toEnvironmentConfig
().
entries
)
{
for
(
final
MapEntry
<
String
,
String
>
config
in
buildInfo
.
toEnvironmentConfig
().
entries
)
{
xcodeBuildSettings
.
add
(
'
${config.key}
=
${config.value}
'
);
xcodeBuildSettings
.
add
(
'
${config.key}
=
${config.value}
'
);
...
...
packages/flutter_tools/lib/src/macos/build_macos.dart
View file @
7aacff22
...
@@ -111,7 +111,6 @@ Future<void> buildMacOS({
...
@@ -111,7 +111,6 @@ Future<void> buildMacOS({
else
else
'-quiet'
,
'-quiet'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
'EXCLUDED_ARCHS=arm64'
,
// TODO(jmagman): Allow ARM https://github.com/flutter/flutter/issues/69221
],
],
trace:
true
,
trace:
true
,
stdoutErrorMatcher:
verboseLogging
?
null
:
_anyOutput
,
stdoutErrorMatcher:
verboseLogging
?
null
:
_anyOutput
,
...
...
packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart
View file @
7aacff22
...
@@ -97,7 +97,6 @@ void main() {
...
@@ -97,7 +97,6 @@ void main() {
else
else
'-quiet'
,
'-quiet'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
'EXCLUDED_ARCHS=arm64'
,
],
],
stdout:
'STDOUT STUFF'
,
stdout:
'STDOUT STUFF'
,
onRun:
()
{
onRun:
()
{
...
@@ -265,6 +264,7 @@ void main() {
...
@@ -265,6 +264,7 @@ void main() {
'TREE_SHAKE_ICONS=true'
,
'TREE_SHAKE_ICONS=true'
,
'FLUTTER_TARGET=lib/other.dart'
,
'FLUTTER_TARGET=lib/other.dart'
,
'BUNDLE_SKSL_PATH=foo/bar.sksl.json'
,
'BUNDLE_SKSL_PATH=foo/bar.sksl.json'
,
'EXCLUDED_ARCHS=arm64'
,
]));
]));
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fileSystem
,
FileSystem:
()
=>
fileSystem
,
...
...
packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart
View file @
7aacff22
...
@@ -41,7 +41,10 @@ void main() {
...
@@ -41,7 +41,10 @@ void main() {
// Config is updated if command succeeded.
// Config is updated if command succeeded.
expect
(
generatedConfig
,
exists
);
expect
(
generatedConfig
,
exists
);
expect
(
generatedConfig
.
readAsStringSync
(),
contains
(
'DART_OBFUSCATION=true'
));
expect
(
generatedConfig
.
readAsStringSync
(),
allOf
(
contains
(
'DART_OBFUSCATION=true'
),
isNot
(
contains
(
'EXCLUDED_ARCHS'
)),
));
// file that only exists if app was fully built.
// file that only exists if app was fully built.
final
File
frameworkPlist
=
fileSystem
.
file
(
final
File
frameworkPlist
=
fileSystem
.
file
(
...
...
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