Merges to android Pi release (part 6)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Enable Cast for Android Things build.

  Author: Thoren Paulson <thoren@google.com>

  [ Merge of http://go/wvgerrit/29941 ]

  Added a path to make_cast_libwvlevel3 for Android Things. Added the new
  system id to the preprocessor guards in android_keybox.cpp. Guarded the
  references to stderr in page_allocator.cpp because for some reason they
  don't get resolved when we link against the resulting library.

  BUG: 63443584

* Resolve memory leaks in use of OpenSSL.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32700 ]

  Use of EVP_CIPHER_CTX requires a call to EVP_CIPHER_CTX_cleanup().

* Memory leak in OpenSSL RSA key handling.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32621 ]

  This fixes a range of tests. --gtest_filter="CdmDecrypt*" runs
  five tests and still loses 5 objects totalling 1320 bytes (down
  from 6200 bytes).

* Unit test and mock OEMCrypto memory leaks.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32640 ]

  More memory leak cleanup. All remaining leaks are due
  to calls to CRYPTO_malloc() without the matching free
  (i.e., calls into openssl).

* Clean up memory leaks in tests.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32600 ]

  This is the first pass at cleaning up memory leaks. These leaks
  were affecting a lot of tests, making it hard to identify more
  serious leaks.

  Switch to unique_ptr<> pointers for CdmEngine in
  generic_crypto_unittest tests for FileSystem object in
  mock OEMCrypto's CryptoEngine object.

* Fix broken tests - linux-only & address sanitizer failures.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32460 ]

  Fix broken test:
    WvCdmEnginePreProvTestStaging.ServiceCertificateInitialNoneTest

  Fix failures found by address sanitizer:
    DeviceFilesUsageInfoTest.RetrieveByProviderSessionToken
    DeviceFilesUsageInfoTest.UpdateUsageInfo

  NOTE: address sanitizer cannot handle EXPECT_CALL macros containing
  a call with a Contains matcher as an argument, e.g.:

  EXPECT_CALL(file,
              Write(Contains(certificate, wrapped_private_key, 0),
                    Gt(certificate.size() + wrapped_private_key.size())))

  The address sanitizer reports a crash, issues a report, and stops. A
  temporary fix is to replace the "Contains()" argument with "_".

* Usage license handling corrections

  Author: Rahul Frias <rfrias@google.com>

  [ Merge of http://go/wvgerrit/28540 ]

  Validate that offline licenses that do not contain a provider session
  token are not handled by the TEE.

  BUG: 38490468

  Test: WV Unit/integration tests, GtsMediaTestCases,
        WvCdmRequestLicenseTest.ReleaseRetryL3OfflineKeySessionUsageDisabledTest

* UsageTableEntry::CopyOldUsageEntry memcpy read out of range.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32220 ]

  The function copies the pst from a variable length input vector
  into a 256 byte character array. But the length argument was a
  fixed value - MAC_KEY_SIZE. Depending on the actual PST length this
  can lead to memcpy reading out of bounds or the PST getting truncated.

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
  commit in the chain.

Change-Id: I81a4593d7d04d0ef6069ce48d0601b6fbdd85de9

libwvdrmengine/Android.mk

@@ -43,6 +43,9 @@ LOCAL_SHARED_LIBRARIES := \
   libwvhidl \
   libbinder \
 
+LOCAL_HEADER_LIBRARIES := \
+  libstagefright_foundation_headers
+
 LOCAL_MODULE := android.hardware.drm@1.0-service.widevine
 LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
 LOCAL_REQUIRED_MODULES := move_widevine_data.sh
@@ -63,6 +66,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_STATIC_LIBRARIES := libcrypto_static
 
@@ -71,6 +75,12 @@ LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+    libutils_headers \
+
+LOCAL_SHARED_LIBRARIES := \
+    liblog
+
 SRC_DIR := cdm/src
 CORE_SRC_DIR := cdm/core/src
 LOCAL_SRC_FILES := \
@@ -94,8 +104,11 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
 
-LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
+CORE_PROTO_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
+METRICS_PROTO_SRC_FILES := $(call all-proto-files-under, cdm/metrics/src)
+LOCAL_SRC_FILES := $(CORE_PROTO_SRC_FILES) $(METRICS_PROTO_SRC_FILES)
 
 generated_sources_dir := $(call local-generated-sources-dir)
 
@@ -107,16 +120,18 @@ generated_sources_dir := $(call local-generated-sources-dir)
 # with this path.
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
     $(generated_sources_dir)/proto \
-    $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src
+    $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src \
+    $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/metrics/src
 
 include $(BUILD_STATIC_LIBRARY)
 
 # -----------------------------------------------------------------------------
-# Builds libhidl_utils.a
+# Builds libwidevinehidl_utils.a
 #
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libhidl_utils
+LOCAL_MODULE := libwidevinehidl_utils
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
@@ -126,6 +141,9 @@ LOCAL_C_INCLUDES := \
 LOCAL_SRC_FILES := \
     src_hidl/TypeConvert.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+  libstagefright_headers
+
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm@1.0
 
@@ -172,6 +190,10 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   libutils \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers \
+  libstagefright_headers
+
 LOCAL_MODULE := libwvdrmengine
 
 LOCAL_MODULE_RELATIVE_PATH := mediadrm