diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-06 07:27:11 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-06 07:27:11 +0000 |
| commit | ea8bcb91a7235d0bedb0a8bde132ec91c20904d1 (patch) | |
| tree | 745eef259847af9c21bac17a8275d3b78f7ccae6 | |
| parent | 62f5b94c165efbe084b53aed8b9b1be1be352e05 (diff) | |
| parent | dccc6a85432006c78b95fce2eadfd1d98eddd10e (diff) | |
| download | ipacfg-mgr-ea8bcb91a7235d0bedb0a8bde132ec91c20904d1.tar.gz | |
release-request-d6bf2db5-83c3-41cb-ba89-644c366c2525-for-git_oc-mr1-release-4070602 snap-temp-L56000000070867102
Change-Id: I57d9ad60d97f119880b9cf7f194595dc88b1da76
| -rw-r--r-- | msm8998/hal/Android.mk | 32 | ||||
| -rw-r--r-- | msm8998/ipacm/src/Android.mk | 6 | ||||
| -rw-r--r-- | msm8998/ipacm/src/IPACM_Main.cpp | 2 | ||||
| -rw-r--r-- | msm8998/ipanat/src/Android.mk | 11 |
4 files changed, 24 insertions, 27 deletions
diff --git a/msm8998/hal/Android.mk b/msm8998/hal/Android.mk index c24a611..b342a69 100644 --- a/msm8998/hal/Android.mk +++ b/msm8998/hal/Android.mk @@ -3,26 +3,26 @@ 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 + 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 + 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 diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index 26b1ba5..ed3fb8d 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) +BOARD_IPAv3_LIST += sdm845 +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))) @@ -110,4 +110,4 @@ include $(BUILD_PREBUILT) endif # $(TARGET_ARCH) endif -#endif +endif diff --git a/msm8998/ipacm/src/IPACM_Main.cpp b/msm8998/ipacm/src/IPACM_Main.cpp index 347bb88..16ec73a 100644 --- a/msm8998/ipacm/src/IPACM_Main.cpp +++ b/msm8998/ipacm/src/IPACM_Main.cpp @@ -83,7 +83,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define IPACM_FIREWALL_FILE_NAME "mobileap_firewall.xml" #define IPACM_CFG_FILE_NAME "IPACM_cfg.xml" #ifdef FEATURE_IPA_ANDROID -#define IPACM_PID_FILE "/data/vendor/misc/ipa/ipacm.pid" +#define IPACM_PID_FILE "/data/vendor/ipa/ipacm.pid" #define IPACM_DIR_NAME "/data" #else/* defined(FEATURE_IPA_ANDROID) */ #define IPACM_PID_FILE "/etc/ipacm.pid" diff --git a/msm8998/ipanat/src/Android.mk b/msm8998/ipanat/src/Android.mk index d95c373..55a9140 100644 --- a/msm8998/ipanat/src/Android.mk +++ b/msm8998/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))) @@ -9,10 +10,6 @@ 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 @@ -28,4 +25,4 @@ include $(BUILD_SHARED_LIBRARY) endif # $(TARGET_ARCH) endif -#endif +endif |