diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-03 11:28:42 -0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-04 20:12:49 +0000 |
| commit | c641b5117d9667751ba6f650176adfdcb12ce077 (patch) | |
| tree | 9ddd81d4c5c2938aecf5c00619ce62bb982d60c4 | |
| parent | 94e850c87e6061a2dec5db6eba125f3cd5ad2a78 (diff) | |
| download | weaved-c641b5117d9667751ba6f650176adfdcb12ce077.tar.gz | |
Remove hard coded gtest/gmock includes/libs.
Tested that checkbuild passes on volantis.
Bug: http://b/16574165
Change-Id: I7bbbd8b4b926115dec2a90ff36dab32b65a35360
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -25,7 +25,6 @@ buffetCommonCppFlags := buffetCommonCIncludes := \ $(LOCAL_PATH)/.. \ external/cros/system_api \ - external/gtest/include \ buffetSharedLibraries := \ libapmanager-client \ @@ -153,7 +152,6 @@ LOCAL_MODULE := libweaved LOCAL_CPP_EXTENSION := $(buffetCommonCppExtension) LOCAL_CFLAGS := $(buffetCommonCFlags) LOCAL_CPPFLAGS := $(buffetCommonCppFlags) -LOCAL_C_INCLUDES := external/gtest/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_SHARED_LIBRARIES := \ libbinder \ @@ -184,7 +182,6 @@ LOCAL_CFLAGS := $(buffetCommonCFlags) LOCAL_CPPFLAGS := $(buffetCommonCppFlags) LOCAL_C_INCLUDES := \ $(buffetCommonCIncludes) \ - external/gmock/include \ LOCAL_SHARED_LIBRARIES := \ $(buffetSharedLibraries) \ @@ -192,7 +189,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libbrillo-test-helpers \ libchrome_test_helpers \ - libgtest \ libgmock \ libweave-test \ weave-daemon-common \ |