From dbcf1fe3583f839b3f407fb0ba8fe4d75760b867 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Thu, 21 Oct 2021 16:26:40 -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: I77beb6b3ca46eaaa0788d70cb1689b60b2f5b256 --- ipacm/src/Android.mk | 4 ++-- ipanat/src/Android.mk | 2 +- ipanat/test/Android.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk index e3f87e0..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 diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk index b9e8423..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))) diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk index 8b394e2..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))) -- cgit v1.2.3