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

Commit 12f66020 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Reland "Remove legacy/O/O-MR1 matrices."" am: a53f69e1 am: c0355738... 

Merge "Reland "Remove legacy/O/O-MR1 matrices."" am: a53f69e1 am: c0355738 am: 13c12bc1 am: c698d7f2

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

Change-Id: If97f6f317aadf6b1d5c407aff780c16281c98762
parents d8f643f8 c698d7f2

compatibility_matrices/Android.bp

+0 −40
Original line number Diff line number Diff line
@@ -12,46 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.legacy.xml",

    stem: "compatibility_matrix.legacy.xml",

    srcs: [

        "compatibility_matrix.legacy.xml",

    ],

    kernel_configs: [

        // legacy uses O kernel requirements

        "kernel_config_o_3.18",

        "kernel_config_o_4.4",

        "kernel_config_o_4.9",

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.1.xml",

    stem: "compatibility_matrix.1.xml",

    srcs: [

        "compatibility_matrix.1.xml",

    ],

    kernel_configs: [

        "kernel_config_o_3.18",

        "kernel_config_o_4.4",

        "kernel_config_o_4.9",

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.2.xml",

    stem: "compatibility_matrix.2.xml",

    srcs: [

        "compatibility_matrix.2.xml",

    ],

    kernel_configs: [

        "kernel_config_o_mr1_3.18",

        "kernel_config_o_mr1_4.4",

        "kernel_config_o_mr1_4.9",

    ],

}



vintf_compatibility_matrix {

    name: "framework_compatibility_matrix.3.xml",

    stem: "compatibility_matrix.3.xml",

compatibility_matrices/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 
endif # DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE



my_system_matrix_deps := \

    framework_compatibility_matrix.legacy.xml \

    framework_compatibility_matrix.1.xml \

    framework_compatibility_matrix.2.xml \

    framework_compatibility_matrix.3.xml \

    framework_compatibility_matrix.4.xml \

    framework_compatibility_matrix.5.xml \

compatibility_matrices/CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -45,3 +45,6 @@ 
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vintf/compatibility_matrix.device.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vintf/compatibility_matrix.legacy.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vintf/compatibility_matrix.1.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vintf/compatibility_matrix.2.xml)

compatibility_matrices/compatibility_matrix.1.xml

deleted100644 → 0
+0 −326
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework" level="1">

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

        <name>android.hardware.audio</name>

        <version>2.0</version>

        <interface>

            <name>IDevicesFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.audio.effect</name>

        <version>2.0</version>

        <interface>

            <name>IEffectsFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.automotive.evs</name>

        <version>1.0</version>

        <interface>

            <name>IEvsEnumerator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.automotive.vehicle</name>

        <version>2.0</version>

        <interface>

            <name>IVehicle</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.biometrics.fingerprint</name>

        <version>2.1</version>

        <interface>

            <name>IBiometricsFingerprint</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.bluetooth</name>

        <version>1.0</version>

        <interface>

            <name>IBluetoothHci</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.boot</name>

        <version>1.0</version>

        <interface>

            <name>IBootControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.broadcastradio</name>

        <version>1.0</version>

        <interface>

            <name>IBroadcastRadioFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.camera.provider</name>

        <version>2.4</version>

        <interface>

            <name>ICameraProvider</name>

            <instance>legacy/0</instance>

        </interface>

    </hal>

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

        <name>android.hardware.configstore</name>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.contexthub</name>

        <version>1.0</version>

        <interface>

            <name>IContexthub</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.drm</name>

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.dumpstate</name>

        <version>1.0</version>

        <interface>

            <name>IDumpstateDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gatekeeper</name>

        <version>1.0</version>

        <interface>

            <name>IGatekeeper</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gnss</name>

        <version>1.0</version>

        <interface>

            <name>IGnss</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.composer</name>

        <version>2.1</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <interface>

            <name>IMapper</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.health</name>

        <version>1.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.ir</name>

        <version>1.0</version>

        <interface>

            <name>IConsumerIr</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.light</name>

        <version>2.0</version>

        <interface>

            <name>ILight</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

        <interface>

            <name>IOmx</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IOmxStore</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.memtrack</name>

        <version>1.0</version>

        <interface>

            <name>IMemtrack</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.nfc</name>

        <version>1.0</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.power</name>

        <version>1.0</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.radio</name>

        <version>1.0</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

        </interface>

    </hal>

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

        <name>android.hardware.radio.deprecated</name>

        <version>1.0</version>

        <interface>

            <name>IOemHook</name>

            <instance>slot1</instance>

        </interface>

    </hal>

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

        <name>android.hardware.renderscript</name>

        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.soundtrigger</name>

        <version>2.0</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.thermal</name>

        <version>1.0</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tv.cec</name>

        <version>1.0</version>

        <interface>

            <name>IHdmiCec</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tv.input</name>

        <version>1.0</version>

        <interface>

            <name>ITvInput</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.usb</name>

        <version>1.0</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.vibrator</name>

        <version>1.0</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.vr</name>

        <version>1.0</version>

        <interface>

            <name>IVr</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi</name>

        <version>1.0</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi.supplicant</name>

        <version>1.0</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

        </interface>

    </hal>

</compatibility-matrix>

compatibility_matrices/compatibility_matrix.2.xml

deleted100644 → 0
+0 −374
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework" level="2">

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

        <name>android.hardware.audio</name>

        <version>2.0</version>

        <interface>

            <name>IDevicesFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.audio.effect</name>

        <version>2.0</version>

        <interface>

            <name>IEffectsFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.automotive.evs</name>

        <version>1.0</version>

        <interface>

            <name>IEvsEnumerator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.automotive.vehicle</name>

        <version>2.0</version>

        <interface>

            <name>IVehicle</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.biometrics.fingerprint</name>

        <version>2.1</version>

        <interface>

            <name>IBiometricsFingerprint</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.bluetooth</name>

        <version>1.0</version>

        <interface>

            <name>IBluetoothHci</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.boot</name>

        <version>1.0</version>

        <interface>

            <name>IBootControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.broadcastradio</name>

        <version>1.0-1</version>

        <interface>

            <name>IBroadcastRadioFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.camera.provider</name>

        <version>2.4</version>

        <interface>

            <name>ICameraProvider</name>

            <instance>legacy/0</instance>

        </interface>

    </hal>

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

        <name>android.hardware.cas</name>

        <version>1.0</version>

        <interface>

            <name>IMediaCasService</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.configstore</name>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.contexthub</name>

        <version>1.0</version>

        <interface>

            <name>IContexthub</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.drm</name>

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.dumpstate</name>

        <version>1.0</version>

        <interface>

            <name>IDumpstateDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gatekeeper</name>

        <version>1.0</version>

        <interface>

            <name>IGatekeeper</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gnss</name>

        <version>1.0</version>

        <interface>

            <name>IGnss</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.composer</name>

        <version>2.1</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <interface>

            <name>IMapper</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.health</name>

        <version>1.0</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.ir</name>

        <version>1.0</version>

        <interface>

            <name>IConsumerIr</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.light</name>

        <version>2.0</version>

        <interface>

            <name>ILight</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

        <interface>

            <name>IOmx</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IOmxStore</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.memtrack</name>

        <version>1.0</version>

        <interface>

            <name>IMemtrack</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.nfc</name>

        <version>1.0</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.oemlock</name>

        <version>1.0</version>

        <interface>

            <name>IOemLock</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.power</name>

        <version>1.0-1</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.radio</name>

        <version>1.0-1</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

        </interface>

    </hal>

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

        <name>android.hardware.radio.deprecated</name>

        <version>1.0</version>

        <interface>

            <name>IOemHook</name>

            <instance>slot1</instance>

        </interface>

    </hal>

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

        <name>android.hardware.renderscript</name>

        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.soundtrigger</name>

        <version>2.0</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.config</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadConfig</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tetheroffload.control</name>

        <version>1.0</version>

        <interface>

            <name>IOffloadControl</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.thermal</name>

        <version>1.0-1</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tv.cec</name>

        <version>1.0</version>

        <interface>

            <name>IHdmiCec</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.tv.input</name>

        <version>1.0</version>

        <interface>

            <name>ITvInput</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.usb</name>

        <version>1.0-1</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.vibrator</name>

        <version>1.0-1</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.vr</name>

        <version>1.0</version>

        <interface>

            <name>IVr</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.weaver</name>

        <version>1.0</version>

        <interface>

            <name>IWeaver</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi</name>

        <version>1.0-1</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi.offload</name>

        <version>1.0</version>

        <interface>

            <name>IOffload</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.wifi.supplicant</name>

        <version>1.0</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

        </interface>

    </hal>

</compatibility-matrix>