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
50ace38c
Unverified
Commit
50ace38c
authored
May 01, 2021
by
Jonah Williams
Committed by
GitHub
May 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] make bundle-sksl-path a define (#81576)
parent
d4e48a15
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
macos_assemble.sh
packages/flutter_tools/bin/macos_assemble.sh
+1
-1
tool_backend.dart
packages/flutter_tools/bin/tool_backend.dart
+1
-1
xcode_backend.sh
packages/flutter_tools/bin/xcode_backend.sh
+1
-1
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+1
-1
assets.dart
...es/flutter_tools/lib/src/build_system/targets/assets.dart
+1
-1
build_windows.dart
packages/flutter_tools/lib/src/windows/build_windows.dart
+1
-1
ios_test.dart
...ols/test/general.shard/build_system/targets/ios_test.dart
+1
-1
macos_test.dart
...s/test/general.shard/build_system/targets/macos_test.dart
+1
-1
No files found.
packages/flutter_tools/bin/macos_assemble.sh
View file @
50ace38c
...
...
@@ -70,7 +70,7 @@ BuildApp() {
local
bundle_sksl_path
=
""
if
[[
-n
"
$BUNDLE_SKSL_PATH
"
]]
;
then
bundle_sksl_path
=
"-
i
BundleSkSLPath=
${
BUNDLE_SKSL_PATH
}
"
bundle_sksl_path
=
"-
d
BundleSkSLPath=
${
BUNDLE_SKSL_PATH
}
"
fi
local
code_size_directory
=
""
...
...
packages/flutter_tools/bin/tool_backend.dart
View file @
50ace38c
...
...
@@ -83,7 +83,7 @@ or
'-dTreeShakeIcons="
$treeShakeIcons
"'
,
'-dDartObfuscation=
$dartObfuscation
'
,
if
(
bundleSkSLPath
!=
null
)
'-
i
BundleSkSLPath=
$bundleSkSLPath
'
,
'-
d
BundleSkSLPath=
$bundleSkSLPath
'
,
if
(
codeSizeDirectory
!=
null
)
'-dCodeSizeDirectory=
$codeSizeDirectory
'
,
if
(
splitDebugInfo
!=
null
)
...
...
packages/flutter_tools/bin/xcode_backend.sh
View file @
50ace38c
...
...
@@ -82,7 +82,7 @@ BuildApp() {
local
bundle_sksl_path
=
""
if
[[
-n
"
$BUNDLE_SKSL_PATH
"
]]
;
then
bundle_sksl_path
=
"-
i
BundleSkSLPath=
${
BUNDLE_SKSL_PATH
}
"
bundle_sksl_path
=
"-
d
BundleSkSLPath=
${
BUNDLE_SKSL_PATH
}
"
fi
# Default value of assets_path is flutter_assets
...
...
packages/flutter_tools/gradle/flutter.gradle
View file @
50ace38c
...
...
@@ -1075,7 +1075,7 @@ abstract class BaseFlutterTask extends DefaultTask {
args
"--DartDefines=${dartDefines}"
}
if
(
bundleSkSLPath
!=
null
)
{
args
"-
i
BundleSkSLPath=${bundleSkSLPath}"
args
"-
d
BundleSkSLPath=${bundleSkSLPath}"
}
if
(
codeSizeDirectory
!=
null
)
{
args
"-dCodeSizeDirectory=${codeSizeDirectory}"
...
...
packages/flutter_tools/lib/src/build_system/targets/assets.dart
View file @
50ace38c
...
...
@@ -36,7 +36,7 @@ Future<Depfile> copyAssets(Environment environment, Directory outputDirectory, {
BuildMode
buildMode
,
})
async
{
// Check for an SkSL bundle.
final
String
shaderBundlePath
=
environment
.
inputs
[
kBundleSkSLPath
];
final
String
shaderBundlePath
=
environment
.
defines
[
kBundleSkSLPath
]
??
environment
.
inputs
[
kBundleSkSLPath
];
final
DevFSContent
skslBundle
=
processSkSLBundle
(
shaderBundlePath
,
engineVersion:
environment
.
engineVersion
,
...
...
packages/flutter_tools/lib/src/windows/build_windows.dart
View file @
50ace38c
...
...
@@ -209,7 +209,7 @@ Future<void> _runFlutterBuild(Directory buildDirectory, BuildInfo buildInfo, Str
'-dTreeShakeIcons="
${buildInfo.treeShakeIcons}
"'
,
'-dDartObfuscation=
${buildInfo.dartObfuscation}
'
,
if
(
buildInfo
.
bundleSkSLPath
!=
null
)
'-
i
BundleSkSLPath=
${buildInfo.bundleSkSLPath}
'
,
'-
d
BundleSkSLPath=
${buildInfo.bundleSkSLPath}
'
,
if
(
buildInfo
.
codeSizeDirectory
!=
null
)
'-dCodeSizeDirectory=
${buildInfo.codeSizeDirectory}
'
,
if
(
buildInfo
.
splitDebugInfoPath
!=
null
)
...
...
packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart
View file @
50ace38c
...
...
@@ -103,7 +103,7 @@ void main() {
});
testUsingContext
(
'DebugIosApplicationBundle'
,
()
async
{
environment
.
input
s
[
kBundleSkSLPath
]
=
'bundle.sksl'
;
environment
.
define
s
[
kBundleSkSLPath
]
=
'bundle.sksl'
;
environment
.
defines
[
kBuildMode
]
=
'debug'
;
environment
.
defines
[
kCodesignIdentity
]
=
'ABC123'
;
// Precompiled dart data
...
...
packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
View file @
50ace38c
...
...
@@ -205,7 +205,7 @@ void main() {
mode:
BuildMode
.
debug
,
))
.
createSync
();
environment
.
input
s
[
kBundleSkSLPath
]
=
'bundle.sksl'
;
environment
.
define
s
[
kBundleSkSLPath
]
=
'bundle.sksl'
;
fileSystem
.
file
(
artifacts
.
getArtifactPath
(
Artifact
.
vmSnapshotData
,
...
...
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