commit 805caa7e078739d79dcced518ea36550293ed7ee
author Nucca Chen <nuccachen@google.com> Wed Mar 17 07:18:05 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 07:18:05 2021 +0000
tree 4426d70b9508ccb473cac47a0b8ef79489131aa9
parent 921d7bd10295f56f56ad7c4bc88a0e0aea99a86c
parent 8380a99720ca2693dbce2f47bb5f66c7f1ed34b2

Merge "Fix the HAL uninitialized error message for setLocalPrefixes"

hal/Android.mk

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

ipacm/src/Android.mk

diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index cff0960..e3f87e0 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -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

ipanat/src/Android.mk

diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index 4e955c0..b9e8423 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -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

ipanat/test/Android.mk

diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index b8ae6a4..8b394e2 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -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 \