Snap for 8564071 from 276d1f45e7264bb0bedcd23b705cf90e288dd8d9 to mainline-resolv-release
Change-Id: I6704b88117d12f14aa698ec0235ffe732985781f
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/hal/Android.mk b/hal/Android.mk
index 7ec3902..aa4f93b 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -10,6 +10,8 @@
src/PrefixParser.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
LOCAL_MODULE := liboffloadhal
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
#LOCAL_CPP_FLAGS := -Wall -Werror
LOCAL_CFLAGS += -Wno-error
diff --git a/hal/src/HAL.cpp b/hal/src/HAL.cpp
index d72d274..e019c74 100644
--- a/hal/src/HAL.cpp
+++ b/hal/src/HAL.cpp
@@ -410,7 +410,7 @@
memset(&res,0,sizeof(BoolResult));
if (!isInitialized()) {
- BoolResult res = makeInputCheckFailure("Not initialized");
+ res = makeInputCheckFailure("Not initialized");
} else if(prefixesStr.size() < 1) {
res = ipaResultToBoolResult(RET::FAIL_INPUT_CHECK);
} else if (!parser.add(prefixesStr)) {
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index cff0960..eb00b76 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -3,7 +3,7 @@
BOARD_IPAv3_LIST := msm8998
BOARD_IPAv3_LIST += sdm845
BOARD_IPAv3_LIST += sdm710
-ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
+ifeq (,$(call is-board-platform-in-list2,$(BOARD_PLATFORM_LIST)))
ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
@@ -23,7 +23,7 @@
LOCAL_CFLAGS += -DDEBUG
endif
-ifeq ($(call is-board-platform-in-list,$(BOARD_IPAv3_LIST)),true)
+ifneq (,$(call is-board-platform-in-list2,$(BOARD_IPAv3_LIST)))
LOCAL_CFLAGS += -DFEATURE_IPA_V3
endif
@@ -57,6 +57,8 @@
IPACM_OffloadManager.cpp
LOCAL_MODULE := ipacm
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
@@ -88,6 +90,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := $1
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := $1
LOCAL_MODULE_CLASS := ipacm
LOCAL_MODULE_TAGS := debug
@@ -98,6 +102,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := IPACM_cfg.xml
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
LOCAL_MODULE_TAGS := optional
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index 4e955c0..af9af98 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -1,7 +1,7 @@
BOARD_PLATFORM_LIST := msm8916
BOARD_PLATFORM_LIST += msm8909
BOARD_PLATFORM_LIST += msmnile
-ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
+ifeq (,$(call is-board-platform-in-list2,$(BOARD_PLATFORM_LIST)))
ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
@@ -23,6 +23,8 @@
LOCAL_CFLAGS := -DDEBUG -Wall -Werror
LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID
LOCAL_MODULE := libipanat
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
LOCAL_CLANG := true
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index b8ae6a4..572407f 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -1,5 +1,5 @@
BOARD_PLATFORM_LIST := test
-ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
+ifneq (,$(call is-board-platform-in-list2,$(BOARD_PLATFORM_LIST)))
ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
@@ -14,6 +14,8 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_MODULE := ipa_nat_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := ipa_nat_test000.c \
ipa_nat_test001.c \
ipa_nat_test002.c \
