Merge "Add all of the packages used to support older/upgrading devices to GSI" into main am: 46e7237e41
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2820097
Change-Id: I37096d23da85c95414ae82e89685d36dbff70347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/gsi_system_ext.mk b/gsi_system_ext.mk
index 7e06f87..026e8c0 100644
--- a/gsi_system_ext.mk
+++ b/gsi_system_ext.mk
@@ -30,13 +30,12 @@
PRODUCT_PACKAGES += \
CarrierConfig
-# Add these HIDL services to the GSI. They are optional for devices to add to system_ext
-# for HIDL support, so we add them to the GSI to support those devices that rely on them.
-# These can be removed once we stop supporting upgrades for devices with Android V vendor
-# images because HIDL HALs are not allowed for Android V+.
+# Add all of the packages used to support older/upgrading devices
+# These can be removed as we drop support for the older API levels
PRODUCT_PACKAGES += \
- hwservicemanager \
- android.hidl.allocator@1.0-service
+ $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29) \
+ $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33) \
+ $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34)
# Install a copy of the debug policy to the system_ext partition, and allow
# init-second-stage to load debug policy from system_ext.
