diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:10:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:10:09 +0000 |
commit | 4e57c9e88efffe2263d8b30c1dea44e4414bb78f (patch) | |
tree | a21317570b9087dd0f1b40c720baf6bde6928069 | |
parent | ba108d83b07216db03cd4139145383408fac6772 (diff) | |
parent | 276d1f45e7264bb0bedcd23b705cf90e288dd8d9 (diff) | |
download | ipacfg-mgr-aml_swc_331911000.tar.gz |
Snap for 8570526 from 276d1f45e7264bb0bedcd23b705cf90e288dd8d9 to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release
Change-Id: If7a5b8c595af90f6a39312a1fd7f6122e03eea75
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | hal/Android.mk | 2 | ||||
-rw-r--r-- | hal/src/HAL.cpp | 2 | ||||
-rw-r--r-- | ipacm/src/Android.mk | 10 | ||||
-rw-r--r-- | ipanat/src/Android.mk | 4 | ||||
-rw-r--r-- | ipanat/test/Android.mk | 4 |
6 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/hal/Android.mk b/hal/Android.mk index 7ec3902..aa4f93b 100644 --- a/hal/Android.mk +++ b/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_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 @@ Return<void> HAL::setLocalPrefixes 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_PLATFORM_LIST += msmnile 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 @@ 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 @@ -57,6 +57,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_CLANG := false LOCAL_MODULE_TAGS := optional @@ -88,6 +90,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 @@ -98,6 +102,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/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_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib 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_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 \ |