From 0ec7fb7bccae82cb66582ceb14c59c3620fb309f Mon Sep 17 00:00:00 2001 From: Pete Fotheringham Date: Sat, 17 Dec 2022 08:34:13 +0000 Subject: [PATCH] Use the `math_gt_or_eq` conditional to fix pre-19.1 builds --- GmsCore/Android.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk index 8bdc8b3..4e63729 100644 --- a/GmsCore/Android.mk +++ b/GmsCore/Android.mk @@ -30,8 +30,10 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_CERTIFICATE := PRESIGNED LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml default-permissions-com.google.android.gms.xml sysconfig-com.google.android.gms.xml -LOCAL_PRODUCT_MODULE := true +# these lines will break builds before 19.1 so make them conditional +ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),) LOCAL_USES_LIBRARIES := com.android.location.provider LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar +endif +LOCAL_PRODUCT_MODULE := true include $(BUILD_PREBUILT) -