Merge Widevine CDM-Side Core Changes

This is a combined merge of several small changes to the core in the
Widevine CDM repository:

http://go/wvgerrit/10941
  Rename privacy_crypto to allow more variants.

http://go/wvgerrit/11530
  Add Missing Header to properties.h

http://go/wvgerrit/11531
  More Loosely Couple CdmEngine and CdmSession

Change-Id: I5b3f738ae495ab267da1440421dd7aa6f7860194
This commit is contained in:
John "Juce" Bruce
2015-03-04 12:52:28 -08:00
parent 33ddce2298
commit 7639e0297f
5 changed files with 7 additions and 3 deletions

View File

@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := \
$(CORE_SRC_DIR)/max_res_engine.cpp \
$(CORE_SRC_DIR)/oemcrypto_adapter_dynamic.cpp \
$(CORE_SRC_DIR)/policy_engine.cpp \
$(CORE_SRC_DIR)/privacy_crypto.cpp \
$(CORE_SRC_DIR)/privacy_crypto_openssl.cpp \
$(SRC_DIR)/wv_content_decryption_module.cpp
LOCAL_MODULE := libcdm