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
f63055a8
Unverified
Commit
f63055a8
authored
Jan 12, 2021
by
Jenn Magder
Committed by
GitHub
Jan 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Exclude arm64 from valid iOS simulators (#73755)" (#73807)
This reverts commit
201e5e4e
.
parent
f70ad37e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
16 deletions
+8
-16
project.pbxproj
...gration_tests/ios_host_app/Host.xcodeproj/project.pbxproj
+0
-1
project.pbxproj
...n_tests/ios_host_app_swift/Host.xcodeproj/project.pbxproj
+3
-3
podhelper.rb
packages/flutter_tools/bin/podhelper.rb
+0
-3
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+1
-6
xcodeproj_test.dart
.../flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+0
-2
build_ios_config_only_test.dart
...ls/test/integration.shard/build_ios_config_only_test.dart
+4
-1
No files found.
dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj
View file @
f63055a8
...
@@ -447,7 +447,6 @@
...
@@ -447,7 +447,6 @@
DEBUG_INFORMATION_FORMAT
=
dwarf
;
DEBUG_INFORMATION_FORMAT
=
dwarf
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
ENABLE_TESTABILITY
=
YES
;
ENABLE_TESTABILITY
=
YES
;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]"
=
arm64
;
GCC_C_LANGUAGE_STANDARD
=
gnu11
;
GCC_C_LANGUAGE_STANDARD
=
gnu11
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_NO_COMMON_BLOCKS
=
YES
;
...
...
dev/integration_tests/ios_host_app_swift/Host.xcodeproj/project.pbxproj
View file @
f63055a8
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
archiveVersion
=
1
;
archiveVersion
=
1
;
classes
=
{
classes
=
{
};
};
objectVersion
=
5
1
;
objectVersion
=
5
0
;
objects
=
{
objects
=
{
/* Begin PBXBuildFile section */
/* Begin PBXBuildFile section */
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
5EF266650049BC10ECFD8C86
/* Pods-Host.debug.xcconfig */
,
5EF266650049BC10ECFD8C86
/* Pods-Host.debug.xcconfig */
,
A412A4193ADC80C963762A82
/* Pods-Host.release.xcconfig */
,
A412A4193ADC80C963762A82
/* Pods-Host.release.xcconfig */
,
);
);
name
=
Pods
;
path
=
Pods
;
path
=
Pods
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
...
@@ -199,7 +200,7 @@
...
@@ -199,7 +200,7 @@
name
=
"[CP-User] Run Flutter Build hello Script"
;
name
=
"[CP-User] Run Flutter Build hello Script"
;
runOnlyForDeploymentPostprocessing
=
0
;
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellPath
=
/bin/sh
;
shellScript
=
"set -e\nset -u\nsource \"${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build
\n
"
;
shellScript
=
"set -e\nset -u\nsource \"${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"
;
};
};
96286B727046BA8457A788D0
/* [CP] Copy Pods Resources */
=
{
96286B727046BA8457A788D0
/* [CP] Copy Pods Resources */
=
{
isa
=
PBXShellScriptBuildPhase
;
isa
=
PBXShellScriptBuildPhase
;
...
@@ -390,7 +391,6 @@
...
@@ -390,7 +391,6 @@
buildSettings
=
{
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]"
=
arm64
;
INFOPLIST_FILE
=
Host/Info.plist
;
INFOPLIST_FILE
=
Host/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
(
LD_RUNPATH_SEARCH_PATHS
=
(
"$(inherited)"
,
"$(inherited)"
,
...
...
packages/flutter_tools/bin/podhelper.rb
View file @
f63055a8
...
@@ -68,9 +68,6 @@ def flutter_additional_ios_build_settings(target)
...
@@ -68,9 +68,6 @@ def flutter_additional_ios_build_settings(target)
# When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
# When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
# If the pod only supports a higher version, do not delete to correctly produce an error.
# If the pod only supports a higher version, do not delete to correctly produce an error.
build_configuration
.
build_settings
.
delete
'IPHONEOS_DEPLOYMENT_TARGET'
if
inherit_deployment_target
build_configuration
.
build_settings
.
delete
'IPHONEOS_DEPLOYMENT_TARGET'
if
inherit_deployment_target
# Apple Silicon ARM simulators not yet supported.
build_configuration
.
build_settings
[
'EXCLUDED_ARCHS[sdk=iphonesimulator*]'
]
=
'arm64 i386'
end
end
end
end
...
...
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
f63055a8
...
@@ -108,10 +108,8 @@ void _updateGeneratedEnvironmentVariablesScript({
...
@@ -108,10 +108,8 @@ void _updateGeneratedEnvironmentVariablesScript({
localsBuffer
.
writeln
(
'#!/bin/sh'
);
localsBuffer
.
writeln
(
'#!/bin/sh'
);
localsBuffer
.
writeln
(
'# This is a generated file; do not edit or check into version control.'
);
localsBuffer
.
writeln
(
'# This is a generated file; do not edit or check into version control.'
);
for
(
final
String
line
in
xcodeBuildSettings
)
{
for
(
final
String
line
in
xcodeBuildSettings
)
{
if
(!
line
.
contains
(
'['
))
{
// Exported conditional Xcode build settings do not work.
localsBuffer
.
writeln
(
'export "
$line
"'
);
localsBuffer
.
writeln
(
'export "
$line
"'
);
}
}
}
final
File
generatedModuleBuildPhaseScript
=
useMacOSConfig
final
File
generatedModuleBuildPhaseScript
=
useMacOSConfig
?
project
.
macos
.
generatedEnvironmentVariableExportScript
?
project
.
macos
.
generatedEnvironmentVariableExportScript
...
@@ -211,9 +209,6 @@ List<String> _xcodeBuildSettingsLines({
...
@@ -211,9 +209,6 @@ List<String> _xcodeBuildSettingsLines({
if
(
useMacOSConfig
)
{
if
(
useMacOSConfig
)
{
// ARM not yet supported https://github.com/flutter/flutter/issues/69221
// ARM not yet supported https://github.com/flutter/flutter/issues/69221
xcodeBuildSettings
.
add
(
'EXCLUDED_ARCHS=arm64'
);
xcodeBuildSettings
.
add
(
'EXCLUDED_ARCHS=arm64'
);
}
else
{
// Apple Silicon ARM simulators not yet supported.
xcodeBuildSettings
.
add
(
'EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64 i386'
);
}
}
for
(
final
MapEntry
<
String
,
String
>
config
in
buildInfo
.
toEnvironmentConfig
().
entries
)
{
for
(
final
MapEntry
<
String
,
String
>
config
in
buildInfo
.
toEnvironmentConfig
().
entries
)
{
...
...
packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
View file @
f63055a8
...
@@ -683,14 +683,12 @@ Information about project "Runner":
...
@@ -683,14 +683,12 @@ Information about project "Runner":
final
String
contents
=
config
.
readAsStringSync
();
final
String
contents
=
config
.
readAsStringSync
();
expect
(
contents
.
contains
(
'ARCHS=armv7'
),
isTrue
);
expect
(
contents
.
contains
(
'ARCHS=armv7'
),
isTrue
);
expect
(
contents
.
contains
(
'EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64 i386'
),
isTrue
);
final
File
buildPhaseScript
=
fs
.
file
(
'path/to/project/ios/Flutter/flutter_export_environment.sh'
);
final
File
buildPhaseScript
=
fs
.
file
(
'path/to/project/ios/Flutter/flutter_export_environment.sh'
);
expect
(
buildPhaseScript
.
existsSync
(),
isTrue
);
expect
(
buildPhaseScript
.
existsSync
(),
isTrue
);
final
String
buildPhaseScriptContents
=
buildPhaseScript
.
readAsStringSync
();
final
String
buildPhaseScriptContents
=
buildPhaseScript
.
readAsStringSync
();
expect
(
buildPhaseScriptContents
.
contains
(
'ARCHS=armv7'
),
isTrue
);
expect
(
buildPhaseScriptContents
.
contains
(
'ARCHS=armv7'
),
isTrue
);
expect
(
buildPhaseScriptContents
.
contains
(
'"EXCLUDED_ARCHS'
),
isFalse
);
});
});
testUsingOsxContext
(
'sets TRACK_WIDGET_CREATION=true when trackWidgetCreation is true'
,
()
async
{
testUsingOsxContext
(
'sets TRACK_WIDGET_CREATION=true when trackWidgetCreation is true'
,
()
async
{
...
...
packages/flutter_tools/test/integration.shard/build_ios_config_only_test.dart
View file @
f63055a8
...
@@ -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