diff options
-rw-r--r-- | data-ipa-cfg-mgr/Makefile.am | 3 | ||||
-rw-r--r-- | data-ipa-cfg-mgr/configure.ac | 58 | ||||
-rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/Android.mk | 10 | ||||
-rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/Makefile.am | 55 | ||||
-rw-r--r-- | data-ipa-cfg-mgr/ipanat/src/Android.mk | 12 | ||||
-rw-r--r-- | data-ipa-cfg-mgr/ipanat/src/Makefile.am | 38 |
6 files changed, 0 insertions, 176 deletions
diff --git a/data-ipa-cfg-mgr/Makefile.am b/data-ipa-cfg-mgr/Makefile.am deleted file mode 100644 index fab2aff..0000000 --- a/data-ipa-cfg-mgr/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign -SUBDIRS = ipanat/src ipacm/src/ diff --git a/data-ipa-cfg-mgr/configure.ac b/data-ipa-cfg-mgr/configure.ac deleted file mode 100644 index 6662ef6..0000000 --- a/data-ipa-cfg-mgr/configure.ac +++ /dev/null @@ -1,58 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.65]) -AC_INIT(data-ipa, 1.0.0) -AM_INIT_AUTOMAKE(data-ipa, 1.0.0) -AC_OUTPUT(Makefile ipanat/src/Makefile ipacm/src/Makefile) -AC_CONFIG_SRCDIR([ipanat/src/ipa_nat_drv.c]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_LIBTOOL -AC_PROG_CXX - -PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) -AC_SUBST([LIBXML_CFLAGS]) -AC_SUBST([LIBXML_LIBS]) - -# Checks for libraries. - -AC_ARG_WITH(sanitized-headers, - AS_HELP_STRING([--with-sanitized-headers=DIR], - [Specify the location of the sanitized Linux headers]), - [CPPFLAGS="$CPPFLAGS -idirafter $withval"]) -AM_CONDITIONAL(KERNELMODULES, [test -n -eq 0]) - -AC_ARG_WITH([glib], - AC_HELP_STRING([--with-glib], - [enable glib, building HLOS systems which use glib])) - -if (test "x${with_glib}" = "xyes"); then - AC_DEFINE(ENABLE_USEGLIB, 1, [Define if HLOS systems uses glib]) - PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes, - AC_MSG_ERROR(GThread >= 2.16 is required)) - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes, - AC_MSG_ERROR(GLib >= 2.16 is required)) - GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS" - GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS" - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) -fi - -AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes") - -# Checks for header files. -AC_CHECK_HEADERS([fcntl.h netinet/in.h sys/ioctl.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_OFF_T - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_MMAP -AC_CHECK_FUNCS([memset munmap]) - -AC_OUTPUT diff --git a/data-ipa-cfg-mgr/ipacm/src/Android.mk b/data-ipa-cfg-mgr/ipacm/src/Android.mk index bae667e..dd5e275 100644 --- a/data-ipa-cfg-mgr/ipacm/src/Android.mk +++ b/data-ipa-cfg-mgr/ipacm/src/Android.mk @@ -1,10 +1,4 @@ -BOARD_PLATFORM_LIST := msm8909 -BOARD_PLATFORM_LIST += msm8916 -BOARD_PLATFORM_LIST += msm8917 BOARD_IPAv3_LIST := msm8998 -ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) -ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) -ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH))) LOCAL_PATH := $(call my-dir) @@ -113,7 +107,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_OWNER := ipacm include $(BUILD_PREBUILT) - -endif # $(TARGET_ARCH) -endif -endif diff --git a/data-ipa-cfg-mgr/ipacm/src/Makefile.am b/data-ipa-cfg-mgr/ipacm/src/Makefile.am deleted file mode 100644 index 92ea904..0000000 --- a/data-ipa-cfg-mgr/ipacm/src/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AM_CPPFLAGS = -I./../inc \ - -I$(top_srcdir)/ipanat/inc \ - ${LIBXML_CFLAGS} -AM_CPPFLAGS += -Wall -Wundef -Wno-trigraphs -AM_CPPFLAGS += -DDEBUG -g -DFEATURE_ETH_BRIDGE_LE -DFEATURE_L2TP -AM_CPPFLAGS += -DFEATURE_IPA_V3 - -ipacm_SOURCES = IPACM_Main.cpp \ - IPACM_Conntrack_NATApp.cpp\ - IPACM_ConntrackClient.cpp \ - IPACM_ConntrackListener.cpp \ - IPACM_EvtDispatcher.cpp \ - IPACM_Config.cpp \ - IPACM_CmdQueue.cpp \ - IPACM_Log.cpp \ - IPACM_Filtering.cpp \ - IPACM_Routing.cpp \ - IPACM_Header.cpp \ - IPACM_Lan.cpp \ - IPACM_Iface.cpp \ - IPACM_Wlan.cpp \ - IPACM_Wan.cpp \ - IPACM_IfaceManager.cpp \ - IPACM_Neighbor.cpp \ - IPACM_Netlink.cpp \ - IPACM_Xml.cpp \ - IPACM_LanToLan.cpp - -bin_PROGRAMS = ipacm - -requiredlibs = ${LIBXML_LIB} -lxml2 -lpthread -lnetfilter_conntrack -lnfnetlink\ - ../../ipanat/src/libipanat.la - -AM_CPPFLAGS += "-std=c++0x" - -if USE_GLIB -ipacm_CFLAGS = $(AM_CFLAGS) -DUSE_GLIB @GLIB_CFLAGS@ -ipacm_LDFLAGS = -lpthread @GLIB_LIBS@ -ipacm_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@ -else -ipacm_CFLAGS = $(AM_CFLAGS) -ipacm_LDFLAGS = -lpthread -ipacm_CPPFLAGS = $(AM_CPPFLAGS) -endif -ipacm_LDADD = $(requiredlibs) - -LOCAL_MODULE := libipanat -LOCAL_PRELINK_MODULE := false -include $(BUILD_SHARED_LIBRARY) - -etcdir = ${sysconfdir} -etc_SCRIPTS = IPACM_cfg.xml - -init_ddir = ${sysconfdir}/init.d -init_d_SCRIPTS = start_ipacm_le diff --git a/data-ipa-cfg-mgr/ipanat/src/Android.mk b/data-ipa-cfg-mgr/ipanat/src/Android.mk index 4e10596..01873ce 100644 --- a/data-ipa-cfg-mgr/ipanat/src/Android.mk +++ b/data-ipa-cfg-mgr/ipanat/src/Android.mk @@ -1,10 +1,3 @@ -BOARD_PLATFORM_LIST := msm8909 -BOARD_PLATFORM_LIST += msm8916 -BOARD_PLATFORM_LIST += msm8917 -ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) -ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) -ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH))) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -23,10 +16,5 @@ LOCAL_CFLAGS := -DDEBUG -Wall -Werror LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID LOCAL_MODULE := libipanat LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false LOCAL_CLANG := true include $(BUILD_SHARED_LIBRARY) - -endif # $(TARGET_ARCH) -endif -endif diff --git a/data-ipa-cfg-mgr/ipanat/src/Makefile.am b/data-ipa-cfg-mgr/ipanat/src/Makefile.am deleted file mode 100644 index 8e2d005..0000000 --- a/data-ipa-cfg-mgr/ipanat/src/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -AM_CFLAGS = -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -if KERNELMODULES -AM_CFLAGS += -I./../inc $(KERNEL_DIR)/include -else -AM_CFLAGS += -I./../inc -endif -#AM_CFLAGS += -DDEBUG -g - -common_CFLAGS = -DUSE_GLIB @GLIB_CFLAGS@ -if !KERNELMODULES -common_LDFLAGS = -lrt @GLIB_LIBS@ -endif - -if KERNELMODULES -library_includedir = ../inc $(KERNEL_DIR)/include $(pkgincludedir) -else -library_includedir = $(pkgincludedir) -endif - -c_sources = ipa_nat_drv.c \ - ipa_nat_drvi.c \ - ipa_nat_logi.c - -library_include_HEADERS = ./../inc/ipa_nat_drvi.h \ - ./../inc/ipa_nat_drv.h \ - ./../inc/ipa_nat_logi.h - -if KERNELMODULES -noinst_LIBRARIES = libipanat.a -libipanat_a_C = @C@ -libipanat_a_SOURCES = $(c_sources) -else -lib_LTLIBRARIES = libipanat.la -libipanat_la_C = @C@ -libipanat_la_SOURCES = $(c_sources) -libipanat_la_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) -libipanat_la_LDFLAGS = -shared $(common_LDFLAGS) -version-info 1:0:0 -endif |