widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Call to Install Keybox to Widevine CDM

Browse Source 
This merges the following changes from the Widevine CDM repository:

1a72a7e  Combine utility code into single library on Android
  Combines several previously-separate files into a static library,
  libcdm_utils, so that it can easily be used by both CDM and
  OEMCrypto.

8c4d04d  Install Keybox
  If the keybox has not been installed, install it from
  /factory/wv.keys.

Bug: 9972451
Change-Id: I8688ecd0adcf321e0c7d0faf55dd10f3910c12ec
This commit is contained in:
John "Juce" Bruce
2013-08-08 14:52:31 -07:00
parent ddf957faa5
commit b0d85ac1af
14 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/test/Android.mk
View File

@@ -21,12 +21,12 @@ LOCAL_C_INCLUDES += \
vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
# TODO(fredgc): fix order dependencies on libwvlevel3 and libwvwrapper.
LOCAL_STATIC_LIBRARIES := \
libgtest \
libgtest_main \
libwvwrapper \
libwvlevel3 \
libcdm_utils \
LOCAL_SHARED_LIBRARIES := \
libcrypto \