From 42e21600a075eef02c2dd0717156dbddd273fbb7 Mon Sep 17 00:00:00 2001
From: "John W. Bruce" <juce@google.com>
Date: Tue, 19 Feb 2019 13:52:25 -0800
Subject: [PATCH] Do Not Add Parallel Unit Tests

(This is a merge of http://go/wvgerrit/71325)

Widevine CE CDM and the buildbot now have parallel operations unit
tests. These tests are not relevant on Android since it is not possible
to call into the Android CDM from multiple threads. However, there is
one change in CdmEngine that needs to be copied over to Android for
consistency's sake.

Bug: 70889998
Bug: 118584039
Test: Android Build
Change-Id: Iea5df62be256383e832b4fcfbd5ff5090e3f3b03
---
 libwvdrmengine/cdm/core/include/cdm_engine.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libwvdrmengine/cdm/core/include/cdm_engine.h b/libwvdrmengine/cdm/core/include/cdm_engine.h
index 3a94f0c6..62cf051a 100644
--- a/libwvdrmengine/cdm/core/include/cdm_engine.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine.h
@@ -343,6 +343,7 @@ class CdmEngine {
 
  protected:
   friend class CdmEngineFactory;
+  friend class ParallelCdmTest;
   friend class WvCdmEnginePreProvTest;
   friend class WvCdmTestBase;
   friend class WvGenericOperationsTest;