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.

Change-Id: I77c956db30921afffe31d11e1cd2d99541925f35
This commit is contained in:
Tim Kilbourn
2015-05-14 17:05:59 -07:00
parent d2e91faf8e
commit 5b830f19b6
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -35,7 +35,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcrypto_static \ libcrypto_static \
libgmock \ libwvgmock \
libgtest \ libgtest \
libgtest_main \ libgtest_main \
libwvlevel3 \ libwvlevel3 \

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

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

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

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

7
libwvdrmengine/test/gmock/src/Android.mk
View File

@@ -8,6 +8,9 @@
# conflict in subtle ways.) # conflict in subtle ways.)
# #
# We build these 2 libraries for the target device only. # We build these 2 libraries for the target device only.
#
# Renamed to libwvgmock and libwvgmock_main to avoid conflicts with
# external/gmock.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
@@ -31,7 +34,7 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock-all.cc LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes) LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags) LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock LOCAL_MODULE := libwvgmock
LOCAL_MODULE_TARGET_ARCH := arm x86 LOCAL_MODULE_TARGET_ARCH := arm x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@@ -42,6 +45,6 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock_main.cc LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes) LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags) LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main LOCAL_MODULE := libwvgmock_main
LOCAL_MODULE_TARGET_ARCH := arm x86 LOCAL_MODULE_TARGET_ARCH := arm x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)