Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Fix REGRESSION(9dcf2c8): "Support install application on Tizen". #588

Merged
merged 2 commits into from
Sep 9, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 1 addition & 26 deletions packaging/xwalk
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
#!/bin/sh

# Determine the most suitable GL implementation by guessing the Tizen profile
# being used.
#
# We could leave it up to Chromium to pick the best GL implementation, but
# right now it (ie. gl_implementation_x11.cc) will, by default, only try using
# Desktop GL and optionally fall back to OSMesa, and hardcoding a single one
# ("egl", for example), causes crashes in some configurations, such as the
# emulator.
if [ -f /usr/lib/xwalk/libosmesa.so ]; then
# If libosmesa.so is present, the crosswalk-emulator-support package has
# been installed and we can assume we're running in the emulator.
GL_IMPLEMENTATION="osmesa"
elif [ -f /usr/lib/libGL.so ]; then
# libGL.so is not installed by the EGL packages used by the mobile profile,
# so we can assume full-blown Mesa (or something analogous) is present.
GL_IMPLEMENTATION="desktop"
else
# Otherwise, assume libGLESv2.so is available and we have an EGL
# implementation.
GL_IMPLEMENTATION="egl"
fi

exec /usr/lib/xwalk/xwalk --use-gl="${GL_IMPLEMENTATION}" \
--ignore-gpu-blacklist \
--allow-file-access-from-files \
"$@"
exec /usr/lib/xwalk/xwalk $@
1 change: 0 additions & 1 deletion runtime/browser/xwalk_browser_main_parts.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ void XWalkBrowserMainParts::PreMainMessageLoopStart() {
#if !defined(OS_ANDROID)
CommandLine* command_line = CommandLine::ForCurrentProcess();
#if defined(OS_TIZEN_MOBILE)
command_line->AppendSwitch(switches::kFullscreen);
command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
command_line->AppendSwitch(switches::kIgnoreGpuBlacklist);

Expand Down