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

Commit 8c202cc6 authored by Devin Moore's avatar Devin Moore Committed by Android (Google) Code Review
Browse files

Merge "[conflict] Merge "Rename compatibility_matrix.current.xml" am:... 

Merge "[conflict] Merge "Rename compatibility_matrix.current.xml" am: 227fecd3 am: 18ace8f8 am: 3b485172"
parents 75c42c09 8088c09a

compatibility_matrices/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ vintf_compatibility_matrix { 
}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.current.xml",

    stem: "compatibility_matrix.current.xml",

    name: "framework_compatibility_matrix.8.xml",

    stem: "compatibility_matrix.8.xml",

    srcs: [

        "compatibility_matrix.current.xml",

        "compatibility_matrix.8.xml",

    ],

    kernel_configs: [

        "kernel_config_current_5.10",

compatibility_matrices/Android.mk

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

    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.current.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.device.xml \



my_framework_matrix_deps += \