Merge "Remove WM Extensions from wearable" into main

This commit is contained in:
Chris Li
2024-04-01 08:28:19 +00:00
committed by Android (Google) Code Review
3 changed files with 5 additions and 6 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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.