Changes to CryptoSession to support big usage tables
[ Merge of http://go/wvgerrit/23167 ] This allows CryptoSession to support the new functionality added to OEMCrypto to support big usage tables. No changes in behavior yet. Code that calls these methods will be in a subsequent CL. b/34327459 * Minor changes to cdm/Android.mk and cdm/test/unit-test.mk to remove profiler changes that were missed in previous releases. Test: All unittests other than some oemcrypto, request_license_test passed. Those tests failed with or without this CL. Change-Id: I9becd97c5a8ddf74d30fabd1251e796b534c010f
This commit is contained in:
@@ -18,7 +18,6 @@ LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static
|
||||
|
||||
SRC_DIR := src
|
||||
CORE_SRC_DIR := core/src
|
||||
PROFILER_SRC_DIR := profiler/src
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(CORE_SRC_DIR)/buffer_reader.cpp \
|
||||
@@ -36,6 +35,7 @@ LOCAL_SRC_FILES := \
|
||||
$(CORE_SRC_DIR)/service_certificate.cpp \
|
||||
$(SRC_DIR)/wv_content_decryption_module.cpp \
|
||||
|
||||
|
||||
LOCAL_MODULE := libcdm
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||
|
||||
Reference in New Issue
Block a user