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
d9adfe3f
Unverified
Commit
d9adfe3f
authored
May 27, 2020
by
Jenn Magder
Committed by
GitHub
May 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow FLUTTER_APPLICATION_PATH to be null for misconfigured Xcode projects (#57701)
parent
03d22501
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
83 additions
and
19 deletions
+83
-19
ios_content_validation_test.dart
dev/devicelab/bin/tasks/ios_content_validation_test.dart
+74
-14
apk_utils.dart
dev/devicelab/lib/framework/apk_utils.dart
+1
-0
xcode_backend.sh
packages/flutter_tools/bin/xcode_backend.sh
+8
-5
No files found.
dev/devicelab/bin/tasks/ios_content_validation_test.dart
View file @
d9adfe3f
...
...
@@ -24,19 +24,32 @@ Future<void> main() async {
'--release'
,
'--obfuscate'
,
'--split-debug-info=foo/'
,
'--no-codesign'
,
]);
});
final
String
outputApp
Path
=
path
.
join
(
final
String
build
Path
=
path
.
join
(
flutterProject
.
rootPath
,
'build/ios/iphoneos/Runner.app'
,
'build'
,
'ios'
,
'iphoneos'
,
);
final
String
outputAppFramework
=
path
.
join
(
flutterProject
.
rootPath
,
outputAppPath
,
'Frameworks/App.framework/App'
,
final
String
outputAppPath
=
path
.
join
(
buildPath
,
'Runner.app'
,
);
if
(!
File
(
outputAppFramework
).
existsSync
())
{
fail
(
'Failed to produce expected output at
$outputAppFramework
'
);
final
Directory
outputAppFramework
=
Directory
(
path
.
join
(
outputAppPath
,
'Frameworks'
,
'App.framework'
,
));
final
File
outputAppFrameworkBinary
=
File
(
path
.
join
(
outputAppFramework
.
path
,
'App'
,
));
if
(!
outputAppFrameworkBinary
.
existsSync
())
{
fail
(
'Failed to produce expected output at
${outputAppFrameworkBinary.path}
'
);
}
section
(
'Validate obfuscation'
);
...
...
@@ -46,7 +59,7 @@ Future<void> main() async {
await
inDirectory
(
flutterProject
.
rootPath
,
()
async
{
final
String
response
=
await
eval
(
'grep'
,
<
String
>[
flutterProject
.
name
,
outputAppFramework
],
<
String
>[
flutterProject
.
name
,
outputAppFramework
Binary
.
path
],
canFail:
true
,
);
if
(
response
.
trim
().
contains
(
'matches'
))
{
...
...
@@ -56,16 +69,63 @@ Future<void> main() async {
section
(
'Validate bitcode'
);
final
String
outputFlutterFramework
=
path
.
join
(
final
Directory
outputFlutterFramework
=
Directory
(
path
.
join
(
flutterProject
.
rootPath
,
outputAppPath
,
'Frameworks/Flutter.framework/Flutter'
,
'Frameworks'
,
'Flutter.framework'
,
));
final
File
outputFlutterFrameworkBinary
=
File
(
path
.
join
(
outputFlutterFramework
.
path
,
'Flutter'
,
));
if
(!
outputFlutterFrameworkBinary
.
existsSync
())
{
fail
(
'Failed to produce expected output at
${outputFlutterFrameworkBinary.path}
'
);
}
bitcode
=
await
containsBitcode
(
outputFlutterFrameworkBinary
.
path
);
section
(
'Xcode backend script'
);
outputFlutterFramework
.
deleteSync
(
recursive:
true
);
outputAppFramework
.
deleteSync
(
recursive:
true
);
if
(
outputFlutterFramework
.
existsSync
()
||
outputAppFramework
.
existsSync
())
{
fail
(
'Failed to delete embedded frameworks'
);
}
final
String
xcodeBackendPath
=
path
.
join
(
flutterDirectory
.
path
,
'packages'
,
'flutter_tools'
,
'bin'
,
'xcode_backend.sh'
);
// Simulate a commonly Xcode build setting misconfiguration
// where FLUTTER_APPLICATION_PATH is missing
final
int
result
=
await
exec
(
xcodeBackendPath
,
<
String
>[
'embed_and_thin'
],
environment:
<
String
,
String
>{
'SOURCE_ROOT'
:
flutterProject
.
iosPath
,
'TARGET_BUILD_DIR'
:
buildPath
,
'FRAMEWORKS_FOLDER_PATH'
:
'Runner.app/Frameworks'
,
'VERBOSE_SCRIPT_LOGGING'
:
'1'
,
'ACTION'
:
'install'
,
// Skip bitcode stripping since we just checked that above.
},
);
if
(!
File
(
outputFlutterFramework
).
existsSync
())
{
fail
(
'Failed to produce expected output at
$outputFlutterFramework
'
);
if
(
result
!=
0
)
{
fail
(
'xcode_backend embed_and_thin failed'
);
}
if
(!
outputFlutterFrameworkBinary
.
existsSync
())
{
fail
(
'Failed to re-embed
${outputFlutterFrameworkBinary.path}
'
);
}
if
(!
outputAppFrameworkBinary
.
existsSync
())
{
fail
(
'Failed to re-embed
${outputAppFrameworkBinary.path}
'
);
}
bitcode
=
await
containsBitcode
(
outputFlutterFramework
);
});
if
(
foundProjectName
)
{
...
...
dev/devicelab/lib/framework/apk_utils.dart
View file @
d9adfe3f
...
...
@@ -226,6 +226,7 @@ class FlutterProject {
String
get
rootPath
=>
path
.
join
(
parent
.
path
,
name
);
String
get
androidPath
=>
path
.
join
(
rootPath
,
'android'
);
String
get
iosPath
=>
path
.
join
(
rootPath
,
'ios'
);
Future
<
void
>
addCustomBuildType
(
String
name
,
{
String
initWith
})
async
{
final
File
buildScript
=
File
(
...
...
packages/flutter_tools/bin/xcode_backend.sh
View file @
d9adfe3f
...
...
@@ -264,15 +264,18 @@ ThinAppFrameworks() {
# Adds the App.framework as an embedded binary and the flutter_assets as
# resources.
EmbedFlutterFrameworks
()
{
AssertExists
"
${
FLUTTER_APPLICATION_PATH
}
"
local
project_path
=
"
${
SOURCE_ROOT
}
/.."
if
[[
-n
"
$FLUTTER_APPLICATION_PATH
"
]]
;
then
project_path
=
"
${
FLUTTER_APPLICATION_PATH
}
"
fi
# Prefer the hidden .ios folder, but fallback to a visible ios folder if .ios
# doesn't exist.
local
flutter_ios_out_folder
=
"
${
FLUTTER_APPLICATION_PATH
}
/.ios/Flutter"
local
flutter_ios_engine_folder
=
"
${
FLUTTER_APPLICATION_PATH
}
/.ios/Flutter/engine"
local
flutter_ios_out_folder
=
"
${
project_path
}
/.ios/Flutter"
local
flutter_ios_engine_folder
=
"
${
project_path
}
/.ios/Flutter/engine"
if
[[
!
-d
${
flutter_ios_out_folder
}
]]
;
then
flutter_ios_out_folder
=
"
${
FLUTTER_APPLICATION_PATH
}
/ios/Flutter"
flutter_ios_engine_folder
=
"
${
FLUTTER_APPLICATION_PATH
}
/ios/Flutter"
flutter_ios_out_folder
=
"
${
project_path
}
/ios/Flutter"
flutter_ios_engine_folder
=
"
${
project_path
}
/ios/Flutter"
fi
AssertExists
"
${
flutter_ios_out_folder
}
"
...
...
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