chrome/installer/linux/common/installer.include - Issue 1957643002: media: Move widevine CDM targets to WidevineCdm folder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/linux/common/installer.include

Issue 1957643002: media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: @loader_path/. Created 4 years, 7 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/media/encrypted_media_supported_types_browsertest.cc ('K') | « chrome/installer/linux/BUILD.gn ('k') | chrome/installer/mini_installer/chrome.release » ('j') | third_party/widevine/cdm/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/linux/common/installer.include

diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include

index ed85858d9fda6fbf4468b480295a6f2606a8e5cb..08e163dc9b5f906b09917f939cf06a5e7b21af0b 100644

--- a/chrome/installer/linux/common/installer.include

+++ b/chrome/installer/linux/common/installer.include

@@ -159,9 +159,14 @@ stage_install_common() {

find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;

# Widevine CDM.

- if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then

- install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"

- install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"

+ WIDEVINECDM_SRCDIR="${BUILDDIR}/WidevineCdm"

+ WIDEVINECDM_DESTDIR="${STAGEDIR}/${INSTALLDIR}/WidevineCdm"

+ if [ -f "${WIDEVINECDM_SRCDIR}/libwidevinecdmadapter.so" ]; then

+ install -m 755 -d "${WIDEVINECDM_DESTDIR}"

+ install -m 644 -s "${WIDEVINECDM_SRCDIR}/libwidevinecdmadapter.so" \

+ "${WIDEVINECDM_DESTDIR}/"

+ install -m 644 "${WIDEVINECDM_SRCDIR}/libwidevinecdm.so" \

+ "${WIDEVINECDM_DESTDIR}/"

# ANGLE