Rename the internal copy of gmock.
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:
@@ -35,7 +35,7 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
libcdm \
|
||||
libcdm_protos \
|
||||
libcrypto_static \
|
||||
libgmock \
|
||||
libwvgmock \
|
||||
libgtest \
|
||||
libgtest_main \
|
||||
libwvlevel3 \
|
||||
|
||||
@@ -19,8 +19,8 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
libcdm_protos \
|
||||
libcdm_utils \
|
||||
libcrypto_static \
|
||||
libgmock \
|
||||
libgmock_main \
|
||||
libwvgmock \
|
||||
libwvgmock_main \
|
||||
libgtest \
|
||||
libwvlevel3 \
|
||||
libwvdrmcryptoplugin \
|
||||
|
||||
@@ -20,8 +20,8 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
libcdm_protos \
|
||||
libcdm_utils \
|
||||
libcrypto_static \
|
||||
libgmock \
|
||||
libgmock_main \
|
||||
libwvgmock \
|
||||
libwvgmock_main \
|
||||
libgtest \
|
||||
libwvlevel3 \
|
||||
libwvdrmdrmplugin \
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
# conflict in subtle ways.)
|
||||
#
|
||||
# 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)
|
||||
|
||||
@@ -31,7 +34,7 @@ LOCAL_CPP_EXTENSION := .cc
|
||||
LOCAL_SRC_FILES := gmock-all.cc
|
||||
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
||||
LOCAL_CFLAGS += $(libgmock_cflags)
|
||||
LOCAL_MODULE := libgmock
|
||||
LOCAL_MODULE := libwvgmock
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
@@ -42,6 +45,6 @@ LOCAL_CPP_EXTENSION := .cc
|
||||
LOCAL_SRC_FILES := gmock_main.cc
|
||||
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
||||
LOCAL_CFLAGS += $(libgmock_cflags)
|
||||
LOCAL_MODULE := libgmock_main
|
||||
LOCAL_MODULE := libwvgmock_main
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
Reference in New Issue
Block a user