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