summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-03-02 15:26:44 -0800
committerDan Willemsen <dwillemsen@google.com>2016-03-02 15:26:44 -0800
commit9da60744196c3ac74758bea36131d183294f8343 (patch)
treeae9bcdc6df778238ccbd70b544fd8ea968a29bfe
parent66cf1b18c0a5b62a3beb5b3a165d6ff492afb1c6 (diff)
downloadapmanager-9da60744196c3ac74758bea36131d183294f8343.tar.gz
Stop using BUILD_STATIC_TEST_LIBRARYandroid-n-preview-1
This isn't a library for a test, use BUILD_STATIC_LIBRARY instead. Change-Id: If3a10e6fbaae4347b25f002862240136ac937de4
-rw-r--r--Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index c71955f..5b688e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -87,7 +87,7 @@ LOCAL_SRC_FILES := \
service.cc \
shill_manager.cc
$(eval $(apmanager_common))
-include $(BUILD_STATIC_TEST_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
# === apmanager ===
include $(CLEAR_VARS)
@@ -96,7 +96,6 @@ LOCAL_INIT_RC := apmanager.rc
LOCAL_SRC_FILES := \
main.cc
LOCAL_STATIC_LIBRARIES := libapmanager
-LOCAL_C_INCLUDES += external/gtest/include
$(eval $(apmanager_common))
include $(BUILD_EXECUTABLE)