Make firewallReplaceUidChain match the behaviour of createChain.

[android-x86/system-netd.git] / server / Android.mk

diff --git a/server/Android.mk b/server/Android.mk
index 270a722..71a1087 100644 (file)
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -25,8 +25,12 @@ LOCAL_MODULE := libnetdaidl
 LOCAL_SHARED_LIBRARIES := \
         libbinder \
         libutils
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/binder
 LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/binder
-LOCAL_SRC_FILES := binder/android/net/INetd.aidl
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/binder
+LOCAL_SRC_FILES := \
+        binder/android/net/INetd.aidl \
+        binder/android/net/UidRange.cpp
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -73,6 +77,7 @@ LOCAL_SRC_FILES := \
         Controllers.cpp \
         DnsProxyListener.cpp \
         DummyNetwork.cpp \
+        DumpWriter.cpp \
         FirewallController.cpp \
         FwmarkServer.cpp \
         IdletimerController.cpp \
@@ -99,6 +104,9 @@ LOCAL_SRC_FILES := \
         VirtualNetwork.cpp \
         main.cpp \
         oem_iptables_hook.cpp \
+        binder/android/net/metrics/IDnsEventListener.aidl \
+
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/binder
 
 include $(BUILD_EXECUTABLE)
 
@@ -120,20 +128,18 @@ include $(BUILD_EXECUTABLE)
 ### netd unit tests.
 ###
 include $(CLEAR_VARS)
-LOCAL_MODULE := FirewallControllerTest
+LOCAL_MODULE := netd_unit_test
 LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp
-LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libbase
-include $(BUILD_NATIVE_TEST)
+LOCAL_C_INCLUDES := system/netd/server system/netd/server/binder system/core/logwrapper/include
+LOCAL_SRC_FILES := \
+        NetdConstants.cpp IptablesBaseTest.cpp \
+        BandwidthController.cpp BandwidthControllerTest.cpp \
+        FirewallControllerTest.cpp FirewallController.cpp \
+        SockDiagTest.cpp SockDiag.cpp \
+        StrictController.cpp StrictControllerTest.cpp \
+        UidRanges.cpp \
 
-# Unit tests for SockDiag.cpp.
-include $(CLEAR_VARS)
-LOCAL_MODULE := SockDiagTest
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := SockDiagTest.cpp SockDiag.cpp
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog libbase libcutils liblogwrap
 include $(BUILD_NATIVE_TEST)
+