diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index c92839d..ed13290 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -32,5 +32,6 @@ 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
 LOCAL_USES_LIBRARIES := com.android.location.provider
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions, androidx.window.sidecar
 include $(BUILD_PREBUILT)