Merge "Vendor API level 202404 is now frozen" into main
diff --git a/shared/auto/device_vendor.mk b/shared/auto/device_vendor.mk
index fbd307b..5cc893f 100644
--- a/shared/auto/device_vendor.mk
+++ b/shared/auto/device_vendor.mk
@@ -103,14 +103,11 @@
PRODUCT_PACKAGES += android.hardware.automotive.can-service
# MACSEC HAL
-# TODO(b/323525161) remove the condition once V branch is ready
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
PRODUCT_PACKAGES += android.hardware.macsec-service
PRODUCT_PACKAGES += wpa_supplicant_macsec
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/macsec/wpa_supplicant_macsec.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wpa_supplicant_macsec.conf \
$(LOCAL_PATH)/macsec/init.wpa_supplicant_macsec.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wpa_supplicant_macsec.rc
-endif # RELEASE_AIDL_USE_UNFROZEN
# Occupant Awareness HAL
PRODUCT_PACKAGES += [email protected]
diff --git a/shared/consumerir/device_vendor.mk b/shared/consumerir/device_vendor.mk
index 7dc9373..0ece81d 100644
--- a/shared/consumerir/device_vendor.mk
+++ b/shared/consumerir/device_vendor.mk
@@ -13,13 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-# TODO(b/302088370) remove the condition when libapexsupport is available
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
PRODUCT_PACKAGES += \
com.google.cf.ir
-else
-PRODUCT_PACKAGES += \
- android.hardware.ir-service.example \
- consumerir.default
-endif # RELEASE_AIDL_USE_UNFROZEN
diff --git a/shared/device.mk b/shared/device.mk
index 3771ea1..2993cb0 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -278,20 +278,11 @@
#
# Still use HIDL Audio HAL on 'next'
#
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
LOCAL_AUDIO_PRODUCT_PACKAGE += \
android.hardware.audio.parameter_parser.example_service \
com.android.hardware.audio
PRODUCT_SYSTEM_EXT_PROPERTIES += \
ro.audio.ihaladaptervendorextension_enabled=true
-else
-LOCAL_AUDIO_PRODUCT_PACKAGE += \
- android.hardware.audio.service \
- [email protected] \
- [email protected]
-DEVICE_MANIFEST_FILE += \
- device/google/cuttlefish/guest/hals/audio/effects/manifest.xml
-endif
endif
ifndef LOCAL_AUDIO_PRODUCT_COPY_FILES
@@ -423,18 +414,14 @@
#
# Non-secure implementation of AuthGraph HAL for compliance.
#
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
PRODUCT_PACKAGES += \
com.android.hardware.security.authgraph
-endif
#
# Non-secure implementation of Secretkeeper HAL for compliance.
#
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
PRODUCT_PACKAGES += \
com.android.hardware.security.secretkeeper
-endif
#
# Power and PowerStats HALs
@@ -595,13 +582,9 @@
PRODUCT_COPY_FILES += \
device/google/cuttlefish/shared/config/pci.ids:$(TARGET_COPY_OUT_VENDOR)/pci.ids
-# New in-development HAL services using unfrozen interfaces. Do not include if
-# RELEASE_AIDL_USE_UNFROZEN is true (in the 'next' release configuration).
-ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
# Thread Network AIDL HAL, simulation CLI and OT daemon controller
PRODUCT_PACKAGES += \
com.android.hardware.threadnetwork
-endif # RELEASE_AIDL_USE_UNFROZEN
PRODUCT_CHECK_VENDOR_SEAPP_VIOLATIONS := true
