Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Side by Side Diff: trunk/src/chrome/installer/linux/common/installer.include

Issue 200033005: Revert 258062 "Turns on use_mojo=1 for linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/chrome_installer.gypi ('k') | trunk/src/chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Recursively replace @@include@@ template variables with the referenced file, 1 # Recursively replace @@include@@ template variables with the referenced file,
2 # and write the resulting text to stdout. 2 # and write the resulting text to stdout.
3 process_template_includes() { 3 process_template_includes() {
4 INCSTACK+="$1->" 4 INCSTACK+="$1->"
5 # Includes are relative to the file that does the include. 5 # Includes are relative to the file that does the include.
6 INCDIR=$(dirname $1) 6 INCDIR=$(dirname $1)
7 # Clear IFS so 'read' doesn't trim whitespace 7 # Clear IFS so 'read' doesn't trim whitespace
8 local OLDIFS="$IFS" 8 local OLDIFS="$IFS"
9 IFS='' 9 IFS=''
10 while read -r LINE 10 while read -r LINE
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" 143 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox"
144 144
145 # l10n paks 145 # l10n paks
146 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" 146 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/"
147 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; 147 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \;
148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; 148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
149 149
150 # ffmpeg libs 150 # ffmpeg libs
151 install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/" 151 install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
152 152
153 install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDI R}/lib/"
154
155 # Widevine CDM. 153 # Widevine CDM.
156 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then 154 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
157 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/" 155 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/"
158 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/" 156 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
159 fi 157 fi
160 158
161 # Pepper Flash. 159 # Pepper Flash.
162 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash" 160 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash"
163 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash" 161 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash"
164 install -m 755 -d "${PEPPERFLASH_DESTDIR}" 162 install -m 755 -d "${PEPPERFLASH_DESTDIR}"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 236 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
239 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 237 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
240 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 238 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
241 "${STAGEDIR}${INSTALLDIR}/default-app-block" 239 "${STAGEDIR}${INSTALLDIR}/default-app-block"
242 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 240 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
243 241
244 # documentation 242 # documentation
245 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 243 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
246 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 244 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
247 } 245 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_installer.gypi ('k') | trunk/src/chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698