Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable FontConfig to improve font fallback #40

Merged
merged 3 commits into from
Feb 10, 2021
Merged

Enable FontConfig to improve font fallback #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32f518d
Use LANG instead of LC_TIME to get default locale
swift-kim Feb 8, 2021
3d8825a
Enable FontConfig to improve font fallback
swift-kim Feb 8, 2021
ab1df52
Copy icudtl.dat directly from third_party/icu
swift-kim Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
--target-sysroot `pwd`/tizen_tools/sysroot/$(arch) \
--target-triple $(targetTriple) \
--runtime-mode $(mode) \
--enable-fontconfig \
--embedder-for-target \
--disable-desktop-embeddings \
--build-tizen-shell \
Expand All @@ -69,6 +70,7 @@ jobs:
--target-sysroot `pwd`/tizen_tools/sysroot/$(arch)_40 \
--target-triple $(targetTriple) \
--runtime-mode $(mode) \
--enable-fontconfig \
--embedder-for-target \
--disable-desktop-embeddings \
--build-tizen-shell \
Expand All @@ -83,9 +85,6 @@ jobs:
cp default/out/linux_$(mode)_$(arch)/libflutter_tizen.so $OUTDIR
cp tizen40/out/linux_$(mode)_$(arch)/libflutter_tizen.so $OUTDIR/libflutter_tizen40.so
cp tizen40/out/linux_$(mode)_$(arch)/libflutter_engine.so $OUTDIR
if [ "$(System.JobName)" = "tizen-arm-release" ]; then
cp default/out/linux_$(mode)_$(arch)/icudtl.dat $OUTDIR
fi
displayName: Copy artifacts
workingDirectory: $(buildroot)/output
failOnStderr: true
Expand Down Expand Up @@ -115,12 +114,12 @@ jobs:
cp -r $ROOT/common/cpp/client_wrapper/include common/client_wrapper
cp $ROOT/tizen/public/*.h common/public
cp $ROOT/tizen/LICENSE .
displayName: Copy peripherals
displayName: Copy headers
workingDirectory: $(Build.BinariesDirectory)
failOnStderr: true
- bash: |
cp $(Pipeline.Workspace)/src/third_party/icu/flutter/icudtl.dat common
mv $(Pipeline.Workspace)/tizen-* .
mv tizen-arm-release/icudtl.dat common
for platform in linux windows darwin; do
for mode in release profile; do
curl -o tmp.zip https://storage.googleapis.com/flutter_infra/flutter/$(upstreamVersion)/android-arm-$mode/$platform-x64.zip 2> /dev/null
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/tizen/channels/localization_channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void LocalizationChannel::SendLocales() {
FlutterLocale* flutter_locale = nullptr;
std::vector<FlutterLocale*> flutter_locales;

int ret = i18n_ulocale_set_default(getenv("LC_TIME"));
int ret = i18n_ulocale_set_default(getenv("LANG"));
ret = i18n_ulocale_get_default(&defualt_locale);
if (ret != I18N_ERROR_NONE) {
FT_LOGE("i18n_ulocale_get_default() failed.");
Expand Down