commit 37cde20114b1f7bd3cf49f40c07785d66fb3cea8
author Dan Willemsen <dwillemsen@google.com> Wed Mar 02 15:14:56 2016 -0800
committer Dan Willemsen <dwillemsen@google.com> Wed Mar 02 15:14:56 2016 -0800
tree 1a2245668855afdd46eaf3f77c846480c0cf343e
parent 26ee8f833dda869cf55a75334c41e03d2aa63bf8

Stop using BUILD_STATIC_TEST_LIBRARY

This isn't a library for a test, use BUILD_STATIC_LIBRARY instead.

Change-Id: Ib22f9ac6ed28eb065efeb1b2a824ed9ebe226542

Android.mk

diff --git a/Android.mk b/Android.mk
index 193b552..7b4f06d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,7 +51,7 @@
     firewall_service.cc \
     iptables.cc
 $(eval $(firewalld_common))
-include $(BUILD_STATIC_TEST_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 # === firewalld ===
 include $(CLEAR_VARS)
@@ -60,7 +60,6 @@
 LOCAL_SRC_FILES := \
     main.cc
 LOCAL_STATIC_LIBRARIES := libfirewalld
-LOCAL_C_INCLUDES += external/gtest/include
 $(eval $(firewalld_common))
 include $(BUILD_EXECUTABLE)