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

Include libcdm_protos archive as LOCAL_STATIC_LIBRARIES

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

Prior to this CL libcdm_protos was included as LOCAL_WHOLE_STATIC_LIBRARIES

b/34393411

Test: Ran unittests and streaming/offline playback using playmovies.

Change-Id: I4cdea8620693ee7660c71e44d08122acd07843a2
This commit is contained in:
Rahul Frias
2017-02-02 11:29:28 -08:00
parent eeaaf311e1
commit 6e9eb297b2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/Android.mk
View File

@@ -88,6 +88,7 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto_static \
libjsmn \ libjsmn \
@@ -104,8 +105,6 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation \ libstagefright_foundation \
libutils \ libutils \
LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
LOCAL_MODULE := libwvdrmengine LOCAL_MODULE := libwvdrmengine
LOCAL_MODULE_RELATIVE_PATH := mediadrm LOCAL_MODULE_RELATIVE_PATH := mediadrm