IPACM: enable IPACM_HAL
Enable IPACM_HAL and compile IPANAT and IPACM
Change-Id: I46fa07e92bce06b22da1dea179cc4359b9fcb214
diff --git a/hal/Android.mk b/hal/Android.mk
index 67e9b07..6574682 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -1,29 +1,29 @@
-# LOCAL_PATH := $(call my-dir)
-#
-# include $(CLEAR_VARS)
-# LOCAL_ARM_MODE := arm
-# LOCAL_SRC_FILES := src/CtUpdateAmbassador.cpp \
-# src/HAL.cpp \
-# src/IpaEventRelay.cpp \
-# src/LocalLogBuffer.cpp \
-# src/OffloadStatistics.cpp \
-# src/PrefixParser.cpp
-# LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
-# LOCAL_MODULE := liboffloadhal
-# LOCAL_CPP_FLAGS := -Wall -Werror
-# LOCAL_SHARED_LIBRARIES := libhwbinder \
-# libhidlbase \
-# libhidltransport \
-# liblog \
-# libcutils \
-# libdl \
-# libbase \
-# libutils \
-# libhardware_legacy \
-# libhardware \
-# android.hardware.tetheroffload.config@1.0 \
-# android.hardware.tetheroffload.control@1.0
-# LOCAL_VENDOR_MODULE := true
-# LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-# LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
-# include $(BUILD_SHARED_LIBRARY)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_ARM_MODE := arm
+LOCAL_SRC_FILES := src/CtUpdateAmbassador.cpp \
+ src/HAL.cpp \
+ src/IpaEventRelay.cpp \
+ src/LocalLogBuffer.cpp \
+ src/OffloadStatistics.cpp \
+ src/PrefixParser.cpp
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
+LOCAL_MODULE := liboffloadhal
+#LOCAL_CPP_FLAGS := -Wall -Werror
+LOCAL_SHARED_LIBRARIES := libhwbinder \
+ libhidlbase \
+ libhidltransport \
+ liblog \
+ libcutils \
+ libdl \
+ libbase \
+ libutils \
+ libhardware_legacy \
+ libhardware \
+ android.hardware.tetheroffload.config@1.0 \
+ android.hardware.tetheroffload.control@1.0
+LOCAL_VENDOR_MODULE := true
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+include $(BUILD_SHARED_LIBRARY)
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 1468a5b..01715f8 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -1,7 +1,8 @@
BOARD_PLATFORM_LIST := test
BOARD_IPAv3_LIST := msm8998
BOARD_IPAv3_LIST += sdm845
-ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
+BOARD_IPAv3_LIST += sdm670
+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)))
@@ -28,7 +29,7 @@
LOCAL_CFLAGS := -v
LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID
-LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror
+LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DDEBUG
endif
diff --git a/ipacm/src/IPACM_Filtering.cpp b/ipacm/src/IPACM_Filtering.cpp
index 260871f..411fe90 100644
--- a/ipacm/src/IPACM_Filtering.cpp
+++ b/ipacm/src/IPACM_Filtering.cpp
@@ -142,6 +142,9 @@
return false;
}
IPACMDBG("Added Filtering rule %p\n", ruleTable);
+#else
+ if (ruleTable)
+ IPACMERR("Not support adding Filtering rule %p\n", ruleTable);
#endif
return true;
}
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 4208727..7acb668 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -4657,11 +4657,12 @@
int IPACM_Lan::eth_bridge_add_flt_rule(uint8_t *mac, uint32_t rt_tbl_hdl, ipa_ip_type iptype, uint32_t *flt_rule_hdl)
{
- int len, res = IPACM_SUCCESS;
+ int res = IPACM_SUCCESS;
+#ifdef FEATURE_IPA_V3
+ int len;
struct ipa_flt_rule_add flt_rule_entry;
struct ipa_ioc_add_flt_rule_after *pFilteringTable = NULL;
-#ifdef FEATURE_IPA_V3
if (rx_prop == NULL || tx_prop == NULL)
{
IPACMDBG_H("No rx or tx properties registered for iface %s\n", dev_name);
@@ -4720,6 +4721,9 @@
end:
free(pFilteringTable);
+#else
+ IPACMDBG_H("Received client MAC 0x%02x%02x%02x%02x%02x%02x.\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+ IPACMDBG_H("Not support rt_tbl_hdl %d flt_rule_hdl %p ip-type %d\n", rt_tbl_hdl, flt_rule_hdl, iptype);
#endif
return res;
}
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index 4afc414..157e40c 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -1,5 +1,6 @@
-BOARD_PLATFORM_LIST := test
-ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
+BOARD_PLATFORM_LIST := msm8916
+BOARD_PLATFORM_LIST += msm8909
+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)))