From 023e25e7f305ebcb665125e82d85b41f73f7da47 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 May 2020 08:24:50 -0700 Subject: Add METADATA to ipacfg-mgr: BSD=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I4f5a310bb60e35970ea491a82f44bf9fa5004590 --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA 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 +} -- cgit v1.2.3 From dc155b6b7f8f1cf741d423ddc81eafc45f57538c Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 20:25:25 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/data/ipacfg-mgr Added SPDX-license-identifier-BSD to: msm8998/hal/Android.mk msm8998/ipacm/src/Android.mk msm8998/ipanat/src/Android.mk msm8998/ipanat/test/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia74c5be22cc7381e081e7edd244a0ba831368327 --- msm8998/hal/Android.mk | 2 ++ msm8998/ipacm/src/Android.mk | 6 ++++++ msm8998/ipanat/src/Android.mk | 2 ++ msm8998/ipanat/test/Android.mk | 2 ++ 4 files changed, 12 insertions(+) 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..d33fe87 100644 --- a/msm8998/ipacm/src/Android.mk +++ b/msm8998/ipacm/src/Android.mk @@ -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..3e3b20c 100644 --- a/msm8998/ipanat/src/Android.mk +++ b/msm8998/ipanat/src/Android.mk @@ -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..8b394e2 100644 --- a/msm8998/ipanat/test/Android.mk +++ b/msm8998/ipanat/test/Android.mk @@ -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 \ -- cgit v1.2.3 From 92eaf1805ef7ca8e7cc824b6a2869ecc6e67f06b Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 4 Oct 2021 16:03:26 -0700 Subject: Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx. Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: Iecc07ad88b4ea440d9d491a5e8648e5809e2793a --- msm8998/ipacm/src/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index d33fe87..8215280 100644 --- a/msm8998/ipacm/src/Android.mk +++ b/msm8998/ipacm/src/Android.mk @@ -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 -- cgit v1.2.3 From 773a9407b5974b1b05008563c36f2843ed07cce4 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Thu, 21 Oct 2021 09:39:29 -0700 Subject: Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx. Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: Ia7b88ae64d1d0f09cd390f083abc26598156df52 Merged-In: Iecc07ad88b4ea440d9d491a5e8648e5809e2793a --- msm8998/ipacm/src/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index d33fe87..8215280 100644 --- a/msm8998/ipacm/src/Android.mk +++ b/msm8998/ipacm/src/Android.mk @@ -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 -- cgit v1.2.3 From 252aaa27d88fec19710cab7f402f98927d7b1a92 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Thu, 21 Oct 2021 14:24:15 -0700 Subject: Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-board-platform' --include '*.mk' --exclude 'utils_test.mk' --exclude 'utils_sample_usage.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq +\(\$\(call is-board-platform,(.*)\), *true\)/ifneq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform,(.*)\), *\)/ifeq (,$(call is-board-platform2,\1))/ s/ifneq +\(\$\(call is-board-platform,(.*)\), *true\)/ifeq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifneq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *false\)/ifeq (,T) # TODO: remove useless check/ s/ifneq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/\$\(call is-board-platform,(.*)\)/$(call is-board-platform2,\1)/ EOF ) $files ``` Change-Id: I337c4b33a3a620d6e1c3f73afe5690942028e53d --- msm8998/ipacm/src/Android.mk | 4 ++-- msm8998/ipanat/src/Android.mk | 2 +- msm8998/ipanat/test/Android.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index 8215280..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))) @@ -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 diff --git a/msm8998/ipanat/src/Android.mk b/msm8998/ipanat/src/Android.mk index 3e3b20c..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))) diff --git a/msm8998/ipanat/test/Android.mk b/msm8998/ipanat/test/Android.mk index 8b394e2..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))) -- cgit v1.2.3