commit 536f59a7045df063029ae25239e928ff0d675cfb
author ChromeOS Developer <erikchen@chromium.org> Mon Aug 10 14:39:27 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Aug 11 03:34:59 2020 +0000
tree 28fe57ccbc278170e10d8a79abb6d6810eda1bf1
parent a8f398e2118b8cb91ccc25ff4598f3182614872a

Two small updates to deploy_chrome.py for --lacros.

* The script now copies WidevineCdm if its present.
* The script uses lacros-chrome as the directory name rather than
  linux-chrome.

BUG=chromium:1107709
TEST=run deploy_chrome_unittest.py

Change-Id: I38cfd82a57113e84b04d736ad9d6816bb2ff0a7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2347425
Auto-Submit: Erik Chen <erikchen@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Tested-by: Erik Chen <erikchen@chromium.org>

lib/chrome_util.py

diff --git a/lib/chrome_util.py b/lib/chrome_util.py
index ca0ade6..4f11192 100644
--- a/lib/chrome_util.py
+++ b/lib/chrome_util.py
@@ -433,6 +433,7 @@
     Path('snapshot_blob.bin', optional=True),
     Path('swiftshader/', optional=True),
     Path('crashpad_handler', exe=True, optional=True),
+    Path('WidevineCdm/', optional=True),
 )
 
 

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 0d87fef..26ae98e 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -76,7 +76,7 @@
 
 DF_COMMAND = 'df -k %s'
 
-LACROS_DIR = '/usr/local/linux-chrome'
+LACROS_DIR = '/usr/local/lacros-chrome'
 _CONF_FILE = '/etc/chrome_dev.conf'
 _KILL_LACROS_CHROME_CMD = 'pkill -f %(lacros_dir)s/chrome'
 MODIFIED_CONF_FILE = f'modified {_CONF_FILE}'