Cherry pick 18.4 changes to udc-widevine-dev

Get the udc-widevine-dev Android branch and oemcrypto-v18 cdm branch in
sync. The commit ID for 18.4 on oemcrypto-v18 is
a2f23a2281e5e06dc2867585bdc516fa132b6396.

Merged from go/wvgerrit/190151

Bug: 290252845
Test: WVTS tests are running and passing
Change-Id: I457332e7ca70a5b5169345e1279b3eb9f18413b6

libwvdrmengine/cdm/test/cdm_test_runner.cpp

@@ -0,0 +1,69 @@
+// Copyright 2021 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
+
+#include <assert.h>
+#include <gtest/gtest.h>
+#include <string.h>
+#include <time.h>
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "cdm.h"
+#include "log.h"
+#include "stderr_logger.h"
+#include "test_base.h"
+#include "test_host.h"
+
+widevine::StderrLogger g_stderr_logger;
+std::string g_sandbox_id;
+
+namespace widevine {
+namespace {
+constexpr char kSandboxIdParam[] = "--sandbox_id=";
+
+// Following the pattern established by help text in test_base.cpp
+constexpr char kExtraHelpText[] =
+    "  --sandbox_id=<sandbox_id>\n"
+    "    Specifies the Sandbox ID that should be sent to OEMCrypto via\n"
+    "    OEMCrypto_SetSandbox(). On most platforms, since Sandbox IDs are not\n"
+    "    in use, this parameter should be omitted.\n";
+}  // namespace
+
+int Main(Cdm::IStorage* storage, Cdm::IClock* clock, Cdm::ITimer* timer,
+         Cdm::ILogger* logger, int argc, char** argv) {
+  // Find and filter out the Sandbox ID, if any.
+  std::vector<std::string> args(argv, argv + argc);
+  auto sandbox_id_iter = std::find_if(std::begin(args) + 1, std::end(args),
+                                      [](const std::string& elem) -> bool {
+                                        return elem.find(kSandboxIdParam) == 0;
+                                      });
+  if (sandbox_id_iter != std::end(args)) {
+    g_sandbox_id = sandbox_id_iter->substr(strlen(kSandboxIdParam));
+    args.erase(sandbox_id_iter);
+  }
+
+  Cdm::Status status = Cdm::initialize(
+      Cdm::kOpaqueHandle, storage, clock, timer, logger,
+      static_cast<Cdm::LogLevel>(wvutil::g_cutoff), g_sandbox_id);
+  (void)status;  // status is now used when assertions are turned off.
+  assert(status == Cdm::kSuccess);
+
+  std::vector<const char*> new_argv(args.size());
+  std::transform(
+      std::begin(args), std::end(args), std::begin(new_argv),
+      [](const std::string& arg) -> const char* { return arg.c_str(); });
+  // This must take place after the call to Cdm::initialize() because it makes
+  // calls that are only valid after the library is initialized.
+  if (!wvcdm::WvCdmTestBase::Initialize(static_cast<int>(new_argv.size()),
+                                        new_argv.data(), kExtraHelpText)) {
+    return 1;
+  }
+
+  // Init gtest after oemcrypto and cdm host have been initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
+}  // namespace widevine