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

Use Jsmn to parse json data

Browse Source 
[ Merge of http://go/wvgerrit/16628 ]

Jsmn will replace a local method that parsed json init data.
Added a fix to include all key Ids in the WidevineCencHeader rather than
just the first. Also modified the content_id to reflect that it is a
base64 encoded value.

b/20630275

Change-Id: I7080c8cea21be4dea09a4905a96b4cc03e584c1d
This commit is contained in:
Rahul Frias
2016-01-29 13:08:31 -08:00
parent 7be45a9011
commit e0da404b14
8 changed files with 117 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/Android.mk
View File

@@ -12,7 +12,8 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/third_party/stringencoders/src
LOCAL_C_INCLUDES += \
external/protobuf/src
external/jsmn \
external/protobuf/src \
LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static