diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:00:07 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:00:07 +0000 |
commit | a788c948ed6f503dcc364ccff6cce2aac9b64565 (patch) | |
tree | ccd825f5a992a0d7e73f9e6a233999082b695f4f | |
parent | 5e989183c011ee60297cba96f7451ad1def01768 (diff) | |
parent | 3c912eb72795c2fcaf995aaf32d4738086ee3e38 (diff) | |
download | ipacfg-mgr-a788c948ed6f503dcc364ccff6cce2aac9b64565.tar.gz |
Snap for 8564071 from 3c912eb72795c2fcaf995aaf32d4738086ee3e38 to mainline-cellbroadcast-releaseaml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000android14-mainline-cellbroadcast-releaseandroid13-mainline-cellbroadcast-release
Change-Id: I2bd6d68d0f7d60a5918f436a9f14b360c093f372
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | msm8998/hal/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/ipacm/src/Android.mk | 12 | ||||
-rw-r--r-- | msm8998/ipanat/src/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/ipanat/test/Android.mk | 4 |
5 files changed, 20 insertions, 5 deletions
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/msm8998/hal/Android.mk b/msm8998/hal/Android.mk index 8ade681..62cfedf 100644 --- a/msm8998/hal/Android.mk +++ b/msm8998/hal/Android.mk @@ -10,6 +10,8 @@ LOCAL_SRC_FILES := src/CtUpdateAmbassador.cpp \ src/PrefixParser.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc LOCAL_MODULE := liboffloadhal +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_CFLAGS := \ -Wall \ -Werror \ diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index 2e9ab31..649c833 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 -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))) @@ -13,7 +13,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src LOCAL_C_INCLUDES += $(LOCAL_PATH)/../inc LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../hal/inc -ifeq ($(call is-platform-sdk-version-at-least,20),true) +ifeq (T,T) # TODO: Obsolete, please remove LOCAL_C_INCLUDES += external/icu/icu4c/source/common else LOCAL_C_INCLUDES += external/icu4c/common @@ -34,7 +34,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) 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 @@ -76,6 +76,8 @@ LOCAL_SRC_FILES := IPACM_Main.cpp \ IPACM_OffloadManager.cpp LOCAL_MODULE := ipacm +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liboffloadhal @@ -105,6 +107,8 @@ define ADD_TEST 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 @@ -115,6 +119,8 @@ endef 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/msm8998/ipanat/src/Android.mk b/msm8998/ipanat/src/Android.mk index dfb84b1..89ff5ec 100644 --- a/msm8998/ipanat/src/Android.mk +++ b/msm8998/ipanat/src/Android.mk @@ -1,6 +1,6 @@ BOARD_PLATFORM_LIST := msm8916 BOARD_PLATFORM_LIST += msm8909 -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))) @@ -18,6 +18,8 @@ LOCAL_SRC_FILES := ipa_nat_drv.c \ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := -DDEBUG -Wall -Werror 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/msm8998/ipanat/test/Android.mk b/msm8998/ipanat/test/Android.mk index b8ae6a4..572407f 100644 --- a/msm8998/ipanat/test/Android.mk +++ b/msm8998/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_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include 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 \ |