From 4b88326361029c0d7090c7c8f95783040677351e Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 27 Mar 2024 07:13:07 +0000 Subject: [PATCH] Remove WM Extensions from wearable Wearable doesn't need WM Extensions. Bug: 306666082 Ignore-AOSP-First: need internal-first change to guard with flag Test: atest CtsWindowManagerJetpackTestCases:SdkAvailabilityTest Change-Id: Idd0f7269ccfacbc2e3030f35a5fd2ebf965b8db2 --- target/product/base_system_ext.mk | 3 --- target/product/media_system_ext.mk | 3 +++ target/product/window_extensions_base.mk | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/product/base_system_ext.mk b/target/product/base_system_ext.mk index f0e6ec90c5..76f008f323 100644 --- a/target/product/base_system_ext.mk +++ b/target/product/base_system_ext.mk @@ -28,6 +28,3 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \ hwservicemanager \ android.hidl.allocator@1.0-service \ - -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions_base.mk) diff --git a/target/product/media_system_ext.mk b/target/product/media_system_ext.mk index 2e20af3d47..30dd2e2711 100644 --- a/target/product/media_system_ext.mk +++ b/target/product/media_system_ext.mk @@ -23,3 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk) # /system_ext packages PRODUCT_PACKAGES += \ vndk_apex_snapshot_package \ + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions_base.mk) diff --git a/target/product/window_extensions_base.mk b/target/product/window_extensions_base.mk index 07ed5e3043..ee0e5e7c89 100644 --- a/target/product/window_extensions_base.mk +++ b/target/product/window_extensions_base.mk @@ -14,9 +14,8 @@ # limitations under the License. # -# The base version of window_extensions.mk to be included on all devices. -# Devices that don't support multi-window can choose to drop this. -# TODO(b/326009200): Remove from build that doesn't support multi-window. +# The base version of window_extensions.mk to be included on all non-wearable +# devices. Devices that don't support multi-window can choose to drop this. # # Note: by default the Activity Embedding feature is guarded by app's # targetSDK on Android 15 to avoid app compat impact.