diff options
| author | Thierry Strudel <tstrudel@google.com> | 2017-05-22 17:15:07 -0700 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2017-05-23 20:55:55 +0000 |
| commit | db2e7b222236f6aec16f83c5e0ca0878d164ee4e (patch) | |
| tree | 9b6c4909936bb93b2956c61320414188ef1b6ef7 /msm8998 | |
| parent | d512f4232dc6c7105b0f8088c56f277132ca2ab3 (diff) | |
| download | ipacfg-mgr-db2e7b222236f6aec16f83c5e0ca0878d164ee4e.tar.gz | |
msm8998: allow ipacm to build for msm8998 if module is a listed package
Change-Id: I7c22e7e94a1dca1b9a65426f5bfa6069aa7228cc
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Diffstat (limited to 'msm8998')
| -rw-r--r-- | msm8998/ipacm/src/Android.mk | 15 | ||||
| -rw-r--r-- | msm8998/ipanat/src/Android.mk | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index 739748d..4af84c8 100644 --- a/msm8998/ipacm/src/Android.mk +++ b/msm8998/ipacm/src/Android.mk @@ -1,7 +1,7 @@ BOARD_PLATFORM_LIST := test BOARD_IPAv3_LIST := msm8998 BOARD_IPAv3_LIST += SDM845 -ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) +#ifeq ($(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))) @@ -17,13 +17,14 @@ LOCAL_C_INCLUDES += external/icu/icu4c/source/common else LOCAL_C_INCLUDES += external/icu4c/common endif -LOCAL_C_INCLUDES += external/dhcpcd LOCAL_C_INCLUDES += external/libxml2/include LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include LOCAL_C_INCLUDES += external/libnfnetlink/include +ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +endif LOCAL_CFLAGS := -v @@ -36,11 +37,6 @@ ifeq ($(call is-board-platform-in-list,$(BOARD_IPAv3_LIST)),true) LOCAL_CFLAGS += -DFEATURE_IPA_V3 endif -filetoadd = bionic/libc/kernel/arch-arm/asm/posix_types.h -LOCAL_CFLAGS += $(shell if [ -a $(filetoadd) ] ; then echo -include $(filetoadd) ; fi ;) -filetoadd = bionic/libc/kernel/arch-arm/asm/byteorder.h -LOCAL_CFLAGS += $(shell if [ -a $(filetoadd) ] ; then echo -include $(filetoadd) ; fi ;) - LOCAL_SRC_FILES := IPACM_Main.cpp \ IPACM_EvtDispatcher.cpp \ IPACM_Config.cpp \ @@ -62,15 +58,12 @@ LOCAL_SRC_FILES := IPACM_Main.cpp \ IPACM_Log.cpp LOCAL_MODULE := ipacm -LOCAL_CLANG := false LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libipanat LOCAL_SHARED_LIBRARIES += libxml2 LOCAL_SHARED_LIBRARIES += libnfnetlink LOCAL_SHARED_LIBRARIES += libnetfilter_conntrack -LOCAL_SHARED_LIBRARIES += libdhcpcd -LOCAL_CLANG := true include $(BUILD_EXECUTABLE) ################################################################################ @@ -98,4 +91,4 @@ include $(BUILD_PREBUILT) endif # $(TARGET_ARCH) endif -endif +#endif diff --git a/msm8998/ipanat/src/Android.mk b/msm8998/ipanat/src/Android.mk index 905e901..22d9b0e 100644 --- a/msm8998/ipanat/src/Android.mk +++ b/msm8998/ipanat/src/Android.mk @@ -1,5 +1,5 @@ BOARD_PLATFORM_LIST := test -ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) +#ifeq ($(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))) @@ -9,8 +9,10 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc LOCAL_C_INCLUDES += $(LOCAL_PATH) +ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +endif LOCAL_SRC_FILES := ipa_nat_drv.c \ ipa_nat_drvi.c @@ -24,4 +26,4 @@ include $(BUILD_SHARED_LIBRARY) endif # $(TARGET_ARCH) endif -endif +#endif |