diff options
| author | Kevin May <kevin.may@arm.com> | 2023-07-19 11:38:29 +0100 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2023-07-19 11:50:22 +0100 |
| commit | 5862bc4beca7cc14636c3fbf46e0ada1778beab0 (patch) | |
| tree | 0056586a5f2158754e6438e8474302734538f52c | |
| parent | 9a29dacfe40f076786770cbadef4c471e750a4d2 (diff) | |
| download | android-nn-driver-5862bc4beca7cc14636c3fbf46e0ada1778beab0.tar.gz | |
IVGCVSW-7760 Add support for Android 14
* Replace code duplication with filter
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I8ac5773c7a6622cbab2dbf12f25886c81b485255
| -rw-r--r-- | Android.mk | 32 |
1 files changed, 3 insertions, 29 deletions
@@ -1,5 +1,5 @@ # -# Copyright © 2022 ARM Ltd. and Contributors. All rights reserved. +# Copyright © 2022-2023 ARM Ltd. and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # @@ -43,41 +43,15 @@ R_OR_LATER := 1 ANDROID_R := 1 endif # PLATFORM_VERSION == 11 -ifeq ($(PLATFORM_VERSION),S) +ifeq ($(PLATFORM_VERSION),$(filter $(PLATFORM_VERSION),12 13 14 S T U)) P_OR_LATER := 1 Q_OR_LATER := 1 R_OR_LATER := 1 S_OR_LATER := 1 ANDROID_R := 0 ANDROID_S := 1 -endif # PLATFORM_VERSION == S +endif # PLATFORM_VERSION >= S -ifeq ($(PLATFORM_VERSION),12) -P_OR_LATER := 1 -Q_OR_LATER := 1 -R_OR_LATER := 1 -S_OR_LATER := 1 -ANDROID_R := 0 -ANDROID_S := 1 -endif # PLATFORM_VERSION == 12 - -ifeq ($(PLATFORM_VERSION),T) -P_OR_LATER := 1 -Q_OR_LATER := 1 -R_OR_LATER := 1 -S_OR_LATER := 1 -ANDROID_R := 0 -ANDROID_S := 1 -endif # PLATFORM_VERSION == S - -ifeq ($(PLATFORM_VERSION),13) -P_OR_LATER := 1 -Q_OR_LATER := 1 -R_OR_LATER := 1 -S_OR_LATER := 1 -ANDROID_R := 0 -ANDROID_S := 1 -endif # PLATFORM_VERSION == 13 CPP_VERSION := c++14 |