Skip to content

Commit

Permalink
chromiun: A few refinements and getting rid of the sandbox script.
Browse files Browse the repository at this point in the history
  • Loading branch information
stumbles committed Sep 19, 2014
1 parent ff68b24 commit e1394a5
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 18 deletions.
4 changes: 1 addition & 3 deletions web/chromium/BUILD
Expand Up @@ -41,6 +41,4 @@

# theme installation
mkdir -p /usr/share/themes/Chromium &&
cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/ &&

ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/
1 change: 1 addition & 0 deletions web/chromium/DEPENDS
Expand Up @@ -30,6 +30,7 @@ optional_depends "speex" "-Duse_system_speex=1" "-Duse_system_speex=0"
optional_depends "pulseaudio" "-Denable_webrtc=1" "-Denable_webrtc=0" "To use system provided Realtime Web Communication"
optional_depends "heimdal" "-Duse_kerberos=1" "-Duse_kerberos=0" "To use system provided heimdal (kerberos) support"
optional_depends "libvpx" "-Duse_system_vpx=1" "-Duse_system_vpx=0" "To use system provided VP8 library"
optional_depends "snappy" "-Duse_system_snappy=1" "-Duse_system_snappy=0" "To use system provided snappy, fast decompression/compression support"

optional_depends "icu4c" "-Duse_system_icu=1 -Dicu_use_data_file_flag=0" \
"-Duse_system_icu=0" "To use system provided icu library"
Expand Down
6 changes: 0 additions & 6 deletions web/chromium/POST_BUILD

This file was deleted.

34 changes: 25 additions & 9 deletions web/chromium/PRE_BUILD
@@ -1,9 +1,4 @@
default_pre_build &&

# To properly setup sandboxing need to run this script but it uses sudo, we don't,
# and getting rid of the echo saying it does.
sedit "s:sudo --::g" build/update-linux-sandbox.sh &&
sedit "27d" build/update-linux-sandbox.sh &&

export CHROMIUM_HOME=/usr/lib/$MODULE &&

Expand Down Expand Up @@ -56,7 +51,28 @@ EOF
# A little jiggle for adboe/flash
echo > third_party/adobe/flash/flapper_version.h &&

OPTS+=" -Dproprietary_codecs=1 -Dwerror= -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome \
-Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dlinux_use_bundled_binutils=0 \
-Dffmpeg_branding=Chrome -DENABLE_MEDIA_CAPTURE=1 -Duse_system_speex=1 -Duse_system_libevent=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Dproprietary_codecs=1\
-Duse_system_ffmpeg=1 -Dpython_ver=${PYTHON_VER} -Duse_system_libjpeg=1 -Dremove_webcore_debug_symbols=1 -Dusb_ids_path=/usr/share/usb.ids"
# chrome-sandbox is hardcoded so using anything but that won't work
# Let chromium find the usb id paths on launch instead of compiling
# in the path.
OPTS+=" -Dproprietary_codecs=1 \
-Dwerror= \
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox \
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome \
-Dfastbuild=1 \
-Dlinux_strip_binary=1 \
-Dlinux_use_seccomp_sandbox=1 \
-Dlinux_use_gold_binary=0 \
-Dlinux_use_gold_flags=0 \
-Dlinux_use_bundled_binutils=0 \
-Dffmpeg_branding=Chrome \
-DENABLE_MEDIA_CAPTURE=1 \
-Duse_system_speex=1 \
-Duse_system_libevent=1 \
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
-Dproprietary_codecs=1 \
-Duse_system_ffmpeg=1 \
-Dpython_ver=${PYTHON_VER} \
-Duse_system_libjpeg=1 \
-Dremove_webcore_debug_symbols=1 \
-Dusb_ids_path=/usr/share/usb.ids"

0 comments on commit e1394a5

Please sign in to comment.