diff options
| author | Chaitanya Pratapa <cpratapa@codeaurora.org> | 2019-11-26 11:11:48 -0800 |
|---|---|---|
| committer | Chaitanya Pratapa <cpratapa@codeaurora.org> | 2020-03-02 17:07:49 -0800 |
| commit | b367a24706b9b3dd5065b0d5d20ba1a8974c80e4 (patch) | |
| tree | b2385743d3a405191ee32c3e19240b8292db2bd5 /ipanat | |
| parent | 0cacc4ff148565e65a00affab57a43a87960e0f1 (diff) | |
| download | ipacfg-mgr-b367a24706b9b3dd5065b0d5d20ba1a8974c80e4.tar.gz | |
ipacm: convert Android.mk files to Android.bp
As part of soong modernisation, requirement is to use
Android.bp framework instead of Android.mk. Make changes
to convert Android.mk to Android.bp files.
Change-Id: I8f2d40159360afd0631c0c50cb823455a45396ef
Diffstat (limited to 'ipanat')
| -rw-r--r-- | ipanat/Android.bp | 28 | ||||
| -rw-r--r-- | ipanat/inc/ipa_nat_drvi.h | 3 | ||||
| -rw-r--r-- | ipanat/src/Android.mk | 43 |
3 files changed, 30 insertions, 44 deletions
diff --git a/ipanat/Android.bp b/ipanat/Android.bp new file mode 100644 index 0000000..310304d --- /dev/null +++ b/ipanat/Android.bp @@ -0,0 +1,28 @@ + + +cc_library_shared { + name: "libipanat", + + header_libs: ["qti_kernel_headers"], + + srcs: [ + "src/ipa_nat_drv.c", + "src/ipa_nat_drvi.c", + ], + + shared_libs: + ["libcutils", + "libdl", + "libbase", + "libutils", + ], + export_include_dirs: ["inc"], + vendor: true, + cflags: [ + "-DDEBUG", + "-Wall", + "-Werror", + ] + ["-DFEATURE_IPA_ANDROID"], + + clang: true, +} diff --git a/ipanat/inc/ipa_nat_drvi.h b/ipanat/inc/ipa_nat_drvi.h index 8015c98..292a47b 100644 --- a/ipanat/inc/ipa_nat_drvi.h +++ b/ipanat/inc/ipa_nat_drvi.h @@ -30,9 +30,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef IPA_NAT_DRVI_H #define IPA_NAT_DRVI_H -#include <unistd.h> #include <stdio.h> #include <sys/ioctl.h> +#include <sys/types.h> #include <fcntl.h> #include <sys/mman.h> #include <linux/msm_ipa.h> @@ -40,6 +40,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sys/inotify.h> #include <errno.h> #include <pthread.h> +#include <unistd.h> #include "ipa_nat_logi.h" diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk deleted file mode 100644 index aaa8409..0000000 --- a/ipanat/src/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -BOARD_PLATFORM_LIST := msm8909 -BOARD_PLATFORM_LIST += msm8916 -BOARD_PLATFORM_LIST += msm8917 -TARGET_DISABLE_IPANAT := false - -ifeq ($(TARGET_USES_QMAA),true) -ifneq ($(TARGET_USES_QMAA_OVERRIDE_DATA),true) - TARGET_DISABLE_IPANAT := true -endif #TARGET_USES_QMAA_OVERRIDE_DATA -endif #TARGET_USES_QMAA - -ifneq ($(TARGET_DISABLE_IPANAT),true) -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) - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc -LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr - -LOCAL_SRC_FILES := ipa_nat_drv.c \ - ipa_nat_drvi.c - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../inc -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -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 -endif |