From b8fed7d31bf9cfd1011f7facc0aa72b6af9dfe2a Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 6 Jul 2022 14:11:45 +0100 Subject: IVGCVSW-6899 Add basic Android 13 support to Android.mk * Android 13 does not differ significantly form 12 so there is no need to add a new Android variable for 13 Signed-off-by: Kevin May Change-Id: I4880bd93fea9bdfff6d1e18660ea637b7b6d2ace --- Android.mk | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index bc320d52..0fdc9495 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # -# Copyright © 2017 ARM Ltd. All rights reserved. +# Copyright © 2022 ARM Ltd. and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # @@ -61,6 +61,24 @@ 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 ifeq ($(Q_OR_LATER),1) -- cgit v1.2.1