diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-02 18:07:14 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-02 18:07:14 -0700 |
commit | 3d35db80e12107a9ab6e3eaadd47959d87e1bda3 (patch) | |
tree | 2446fab2eef48a5e93432f585961467e47c8e890 | |
parent | 877de12b85f3eb46096022c4933c7647bb89f17a (diff) | |
parent | aeb161f68f8c051f8df276113165abb767d26ec0 (diff) | |
download | android_external_libnetfilter_conntrack-3d35db80e12107a9ab6e3eaadd47959d87e1bda3.tar.gz android_external_libnetfilter_conntrack-3d35db80e12107a9ab6e3eaadd47959d87e1bda3.tar.bz2 android_external_libnetfilter_conntrack-3d35db80e12107a9ab6e3eaadd47959d87e1bda3.zip |
Merge "libnetfilter_conntrack: Add Android.mk to make libnetfilter_conntrack library"
-rw-r--r-- | Android.mk | 83 | ||||
-rw-r--r-- | libmnl/libmnl.h | 34 |
2 files changed, 117 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..a545d6c --- /dev/null +++ b/Android.mk @@ -0,0 +1,83 @@ +LOCAL_PATH:= $(call my-dir) + +# We need to build this for both the device (as a shared library) +# and the host (as a static library for tools to use). + +common_SRC_FILES := \ + src/main.c \ + src/callback.c \ + src/conntrack/api.c \ + src/conntrack/bsf.c \ + src/conntrack/compare.c \ + src/conntrack/copy.c \ + src/conntrack/filter.c \ + src/conntrack/filter_dump.c \ + src/conntrack/getter.c \ + src/conntrack/grp.c \ + src/conntrack/grp_getter.c \ + src/conntrack/grp_setter.c \ + src/conntrack/setter.c \ + src/conntrack/snprintf.c \ + src/conntrack/snprintf_default.c \ + src/conntrack/snprintf_xml.c \ + src/conntrack/stack.c \ + src/conntrack/parse.c \ + src/conntrack/objopt.c \ + src/conntrack/build.c \ + src/conntrack/labels.c \ + src/expect/api.c \ + src/expect/build.c \ + src/expect/compare.c \ + src/expect/getter.c \ + src/expect/parse.c \ + src/expect/setter.c \ + src/expect/snprintf.c \ + src/expect/snprintf_default.c \ + src/expect/snprintf_xml.c + +common_C_INCLUDES += \ + $(LOCAL_PATH)/include + +# For the device +# ===================================================== + +#include $(CLEAR_VARS) +# +#LOCAL_SRC_FILES := $(common_SRC_FILES) +#LOCAL_C_INCLUDES := $(common_C_INCLUDES) +#LOCAL_C_INCLUDES += external/libnetfilter_conntrack/libmnl/libmnl.h +#LOCAL_C_INCLUDES += external/libnfnetlink/include +#LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +# +#LOCAL_MODULE:= libnetfilter_conntrack +# +#include $(BUILD_STATIC_LIBRARY) + + +# Shared librar +#======================================================= +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(common_SRC_FILES) +LOCAL_C_INCLUDES := $(common_C_INCLUDES) +LOCAL_C_INCLUDES += external/libnetfilter_conntrack/libmnl/libmnl.h +LOCAL_C_INCLUDES += external/libnfnetlink/include +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) libnfnetlink + +LOCAL_MODULE:= libnetfilter_conntrack + +include $(BUILD_SHARED_LIBRARY) +### +### # For the host +### # ======================================================== +### +### include $(CLEAR_VARS) +### LOCAL_SRC_FILES := $(common_SRC_FILES) +### LOCAL_C_INCLUDES := $(common_C_INCLUDES) +### LOCAL_C_INCLUDES += external/libnetfilter_conntrack/libmnl/libmnl.h +### LOCAL_C_INCLUDES += external/libnfnetlink/include +### LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +### LOCAL_MODULE:= libnetfilter_conntrack +### include $(BUILD_HOST_STATIC_LIBRARY) +### diff --git a/libmnl/libmnl.h b/libmnl/libmnl.h new file mode 100644 index 0000000..878bb29 --- /dev/null +++ b/libmnl/libmnl.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2014, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LIBMNL_H_ +#define _LIBMNL_H_ +/* Dummy header file for compilation */ + +#endif |