From 5b830f19b642c5a348994056d69808f469439ac2 Mon Sep 17 00:00:00 2001
From: Tim Kilbourn <tkilbourn@google.com>
Date: Thu, 14 May 2015 17:05:59 -0700
Subject: [PATCH] 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
---
 libwvdrmengine/cdm/test/unit-test.mk       | 2 +-
 libwvdrmengine/mediacrypto/test/Android.mk | 4 ++--
 libwvdrmengine/mediadrm/test/Android.mk    | 4 ++--
 libwvdrmengine/test/gmock/src/Android.mk   | 7 +++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 3b79d09a..656c0320 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -35,7 +35,7 @@ LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
     libcrypto_static \
-    libgmock \
+    libwvgmock \
     libgtest \
     libgtest_main \
     libwvlevel3 \
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index ca589488..8bb4f102 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -19,8 +19,8 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
   libcdm_utils \
   libcrypto_static \
-  libgmock \
-  libgmock_main \
+  libwvgmock \
+  libwvgmock_main \
   libgtest \
   libwvlevel3 \
   libwvdrmcryptoplugin \
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index c4ee490d..7149d23e 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -20,8 +20,8 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
   libcdm_utils \
   libcrypto_static \
-  libgmock \
-  libgmock_main \
+  libwvgmock \
+  libwvgmock_main \
   libgtest \
   libwvlevel3 \
   libwvdrmdrmplugin \
diff --git a/libwvdrmengine/test/gmock/src/Android.mk b/libwvdrmengine/test/gmock/src/Android.mk
index b4fa0446..b7a9093d 100644
--- a/libwvdrmengine/test/gmock/src/Android.mk
+++ b/libwvdrmengine/test/gmock/src/Android.mk
@@ -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)