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

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

Issue 1978123002: Revert of media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/installer/linux/BUILD.gn ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 08e163dc9b5f906b09917f939cf06a5e7b21af0b..ed85858d9fda6fbf4468b480295a6f2606a8e5cb 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -159,14 +159,9 @@
find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
# Widevine CDM.
- 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}/"
+ if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
+ install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
+ install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
fi
# ANGLE
« no previous file with comments | « chrome/installer/linux/BUILD.gn ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698