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

Rename the internal copy of gmock.

Browse Source 
The external/gmock project does not include the patches needed for
widevine, so renaming the internal copy allows both to coexist in the
build system.

(cherry-pick of 5b830f19b6 with conflict.)

Change-Id: I77c956db30921afffe31d11e1cd2d99541925f35
This commit is contained in:
Tim Kilbourn
2015-05-14 17:05:59 -07:00
committed by Elliott Hughes
parent 9fcaf2c6ec
commit c74222f523
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -19,8 +19,8 @@ LOCAL_STATIC_LIBRARIES := \
libcdm_protos \
libcdm_utils \
libcrypto_static \
libgmock \
libgmock_main \
libwvgmock \
libwvgmock_main \
libgtest \
libwvlevel3 \
libwvdrmcryptoplugin \