diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-05 19:15:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-05 19:15:36 +0000 |
| commit | e8afbafe0f6a36c4403ca176c472bb14c8bbbf35 (patch) | |
| tree | ccd825f5a992a0d7e73f9e6a233999082b695f4f | |
| parent | 6e384aa563c7f1627fc634cf7fa3ef7a8d414f58 (diff) | |
| parent | 252aaa27d88fec19710cab7f402f98927d7b1a92 (diff) | |
| download | ipacfg-mgr-e8afbafe0f6a36c4403ca176c472bb14c8bbbf35.tar.gz | |
Snap for 7888828 from 252aaa27d88fec19710cab7f402f98927d7b1a92 to simpleperf-release
Change-Id: Id96aa409929a07fed238807aea5a8290ac87ad67
| -rw-r--r-- | msm8998/ipacm/src/Android.mk | 6 | ||||
| -rw-r--r-- | msm8998/ipanat/src/Android.mk | 2 | ||||
| -rw-r--r-- | msm8998/ipanat/test/Android.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index d33fe87..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 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))) |