Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dfbd901 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp am:... 

Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp am: 4d6b5001 am: 2de00a18

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24642593



Change-Id: I42c99a3bf5253fa7bcb00d8defd271087bcf71f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fa1e5e9 2de00a18

compatibility_matrices/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -103,9 +103,15 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.9.xml \

    framework_compatibility_matrix.device.xml \



# Only allow the use of the unreleased compatibility matrix when we can use unfrozen

# interfaces (in the `next` release configuration).

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

my_system_matrix_deps += \

    framework_compatibility_matrix.9.xml

endif



my_framework_matrix_deps += \

    $(my_system_matrix_deps)