From f0079b1a3fd7d8e3775b56f94eac56c6e97823e7 Mon Sep 17 00:00:00 2001 From: Rohit Date: Mon, 10 Oct 2022 13:59:02 +0530 Subject: [PATCH] prebuiltapks: Declare relevant LOCAL_OPTIONAL_USES_LIBRARIES error: mismatch in the tags between the build system and the manifest: - required libraries in build system: [] vs. in the manifest: [] - optional libraries in build system: [] vs. in the manifest: [androidx.window.extensions, androidx.window.sidecar] - tags in the manifest (prebuilts/prebuiltapks/AccountManager/app-standard-release-unsigned.apk): uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' error: mismatch in the tags between the build system and the manifest: - required libraries in build system: [com.android.location.provider] vs. in the manifest: [com.android.location.provider] - optional libraries in build system: [] vs. in the manifest: [androidx.window.extensions, androidx.window.sidecar] - tags in the manifest (prebuilts/prebuiltapks/GmsCore/play-services-core-withMapbox-withoutNearby-release-unsigned.apk): uses-library:'com.android.location.provider' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar --- AccountManager/Android.mk | 4 ++++ GmsCore/Android.mk | 2 ++ 2 files changed, 6 insertions(+) diff --git a/AccountManager/Android.mk b/AccountManager/Android.mk index 68d4d70..1d85c71 100644 --- a/AccountManager/Android.mk +++ b/AccountManager/Android.mk @@ -6,4 +6,8 @@ LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := app-standard-release-unsigned.apk LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) +ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),) +LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions \ + androidx.window.sidecar +endif include $(BUILD_PREBUILT) diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk index 2698c93..08ecc39 100644 --- a/GmsCore/Android.mk +++ b/GmsCore/Android.mk @@ -29,5 +29,7 @@ LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml LOCAL_REQUIRED_MODULES += microg.xml 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 include $(BUILD_PREBUILT) -- GitLab