Merge "Stop hard coding gtest paths."

2016-08-22 22:57:08 +00:00
parent 8f65d1dd90 eadd3689a2
commit 10f7e17522
5 changed files with 0 additions and 8 deletions
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -18,8 +18,6 @@ LOCAL_SRC_FILES := \
    ../core/test/url_request.cpp

 LOCAL_C_INCLUDES := \
-    external/gmock/include \
-    external/gtest/include \
    external/openssl/include \
    vendor/widevine/libwvdrmengine/android/cdm/test \
    vendor/widevine/libwvdrmengine/cdm/core/include \
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -5,8 +5,6 @@ LOCAL_SRC_FILES := \
  WVCryptoPlugin_test.cpp \

 LOCAL_C_INCLUDES := \
-  external/gmock/include \
-  external/gtest/include \
  frameworks/av/include \
  frameworks/native/include \
  vendor/widevine/libwvdrmengine/cdm/core/include \
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -5,8 +5,6 @@ LOCAL_SRC_FILES := \
  WVDrmPlugin_test.cpp \

 LOCAL_C_INCLUDES := \
-  external/gmock/include \
-  external/gtest/include \
  frameworks/av/include \
  frameworks/native/include \
  vendor/widevine/libwvdrmengine/cdm/core/include \
--- a/libwvdrmengine/oemcrypto/mock/Android.mk
+++ b/libwvdrmengine/oemcrypto/mock/Android.mk
@@ -21,7 +21,6 @@ LOCAL_C_INCLUDES += \
    $(LOCAL_PATH)/src \
    vendor/widevine/libwvdrmengine/cdm/core/include \
    vendor/widevine/libwvdrmengine/third_party/stringencoders/src \
-    external/gtest/include \
    external/openssl/include \
    external/openssl/include/openssl \

--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \
  WVDrmFactory_test.cpp \

 LOCAL_C_INCLUDES := \
-  external/gtest/include \
  frameworks/av/include \
  frameworks/native/include \
  vendor/widevine/libwvdrmengine/include \