diff options
| author | Dan Albert <danalbert@google.com> | 2016-05-04 20:24:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-04 20:24:47 +0000 |
| commit | 8fe01e1f6c02b66845a61bc7193deffc140b2b8f (patch) | |
| tree | 9ddd81d4c5c2938aecf5c00619ce62bb982d60c4 | |
| parent | 17c6b65b83a3f3ffb3236690f7a53176aead1da4 (diff) | |
| parent | 0d57d947348dfd819daeacb36c320883e860df43 (diff) | |
| download | weaved-8fe01e1f6c02b66845a61bc7193deffc140b2b8f.tar.gz | |
Remove hard coded gtest/gmock includes/libs. am: c641b5117d
am: 0d57d94734
* commit '0d57d947348dfd819daeacb36c320883e860df43':
Remove hard coded gtest/gmock includes/libs.
Change-Id: I8a792399a29c4f82ecc37bdba6be0c8788a0547e
| -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 \ |