From 581f4d4b27efb0d9c882da66b2ab0126af1288d9 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 11 Aug 2016 12:35:22 -0700 Subject: Stop hard coding gtest/gmock things. The headers are exported, and the build system automatically adds libgtest for test modules. Test: mma Bug: None Change-Id: Ib72c8ae28a62a16f8bc1a0731726d98dc91c0a13 --- Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index a72c61c..90a2a80 100644 --- a/Android.mk +++ b/Android.mk @@ -32,7 +32,6 @@ libweaveCommonCIncludes := \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/third_party/modp_b64/modp_b64 \ $(LOCAL_PATH)/third_party/libuweave \ - external/gtest/include \ libweaveSharedLibraries := \ libchrome \ @@ -83,7 +82,6 @@ LOCAL_CFLAGS := $(libweaveCommonCFlags) LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) LOCAL_C_INCLUDES := \ $(libweaveCommonCIncludes) \ - external/gmock/include \ LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries) LOCAL_STATIC_LIBRARIES := libgtest libgmock @@ -121,7 +119,6 @@ LOCAL_CFLAGS := $(libweaveCommonCFlags) LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) LOCAL_C_INCLUDES := \ $(libweaveCommonCIncludes) \ - external/gmock/include \ LOCAL_SHARED_LIBRARIES := \ $(libweaveSharedLibraries) \ @@ -130,7 +127,7 @@ LOCAL_STATIC_LIBRARIES := \ libweave-common \ libweave-external \ libweave-test \ - libgtest libgmock \ + libgmock \ libchrome_test_helpers \ LOCAL_CLANG := true -- cgit v1.2.3