Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev

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

diff --git a/server/Android.mk b/server/Android.mk
index e7b01a3..71a1087 100644 (file)
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -14,12 +14,34 @@
 
 LOCAL_PATH := $(call my-dir)
 
+###
+### netd service AIDL interface.
+###
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS := -Wall -Werror
+LOCAL_CLANG := true
+LOCAL_MODULE := libnetdaidl
+LOCAL_SHARED_LIBRARIES := \
+        libbinder \
+        libutils
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/binder
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/binder
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/binder
+LOCAL_SRC_FILES := \
+        binder/android/net/INetd.aidl \
+        binder/android/net/UidRange.cpp
+
+include $(BUILD_SHARED_LIBRARY)
+
+###
+### netd daemon.
+###
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := \
         $(call include-path-for, libhardware_legacy)/hardware_legacy \
         bionic/libc/dns/include \
-        external/libcxx/include \
         external/mdnsresponder/mDNSShared \
         system/netd/include \
 
@@ -27,7 +49,10 @@ LOCAL_CLANG := true
 LOCAL_CPPFLAGS := -std=c++11 -Wall -Werror
 LOCAL_MODULE := netd
 
+LOCAL_INIT_RC := netd.rc
+
 LOCAL_SHARED_LIBRARIES := \
+        libbinder \
         libcrypto \
         libcutils \
         libdl \
@@ -35,9 +60,12 @@ LOCAL_SHARED_LIBRARIES := \
         liblog \
         liblogwrap \
         libmdnssd \
+        libnetdaidl \
         libnetutils \
         libnl \
         libsysutils \
+        libbase \
+        libutils \
 
 LOCAL_STATIC_LIBRARIES := \
         libpcap \
@@ -46,7 +74,10 @@ LOCAL_SRC_FILES := \
         BandwidthController.cpp \
         ClatdController.cpp \
         CommandListener.cpp \
+        Controllers.cpp \
         DnsProxyListener.cpp \
+        DummyNetwork.cpp \
+        DumpWriter.cpp \
         FirewallController.cpp \
         FwmarkServer.cpp \
         IdletimerController.cpp \
@@ -56,6 +87,7 @@ LOCAL_SRC_FILES := \
         NatController.cpp \
         NetdCommand.cpp \
         NetdConstants.cpp \
+        NetdNativeService.cpp \
         NetlinkHandler.cpp \
         NetlinkManager.cpp \
         Network.cpp \
@@ -64,6 +96,7 @@ LOCAL_SRC_FILES := \
         PppController.cpp \
         ResolverController.cpp \
         RouteController.cpp \
+        SockDiag.cpp \
         SoftapController.cpp \
         StrictController.cpp \
         TetherController.cpp \
@@ -71,9 +104,16 @@ 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)
 
+
+###
+### ndc binary.
+###
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := -Wall -Werror
@@ -83,3 +123,23 @@ LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_SRC_FILES := ndc.c
 
 include $(BUILD_EXECUTABLE)
+
+###
+### netd unit tests.
+###
+include $(CLEAR_VARS)
+LOCAL_MODULE := netd_unit_test
+LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
+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 \
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_SHARED_LIBRARIES := liblog libbase libcutils liblogwrap
+include $(BUILD_NATIVE_TEST)
+