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

Commit d02d9f27 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge changes I5716db7c,Id83986fc into sc-dev 

* changes:
  DO NOT MERGE: Disable current matrix.
  freeze compat matrix 6 for Android S
parents bad3aeba e0bb84be

compatibility_matrices/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -60,8 +60,22 @@ vintf_compatibility_matrix { 
    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.6.xml",

    stem: "compatibility_matrix.6.xml",

    srcs: [

        "compatibility_matrix.6.xml",

    ],

    kernel_configs: [

        "kernel_config_s_4.19",

        "kernel_config_s_5.4",

        "kernel_config_s_5.10",

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.current.xml",

    enabled: false,

    stem: "compatibility_matrix.current.xml",

    srcs: [

        "compatibility_matrix.current.xml",

compatibility_matrices/Android.mk

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

    framework_compatibility_matrix.4.xml \

    framework_compatibility_matrix.5.xml \

    framework_compatibility_matrix.current.xml \

    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.device.xml \



my_framework_matrix_deps += \

compatibility_matrices/compatibility_matrix.6.xml

0 → 100644
+650 −0

File added.

Preview size limit exceeded, changes collapsed.

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework" level="6">

<compatibility-matrix version="1.0" type="framework" level="7">

    <hal format="hidl" optional="true">

        <name>android.hardware.atrace</name>

        <version>1.0</version>