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

Commit f98ea300 authored by Daniel Norman's avatar Daniel Norman
Browse files

Uses Android.bp vintf_compatibility_matrix for redfin product FCM. 

This change also includes the following FCM cleanups:
- Adds level="6", specifying that this product FCM is compatible with an
  S vendor image. This is similar to the framework FCM.
- Marks the HAL as required. This is possible now that the redfin_vf
  target includes an additional product FCM specific to level="5" (R).

Bug: 183507590
Test: m redfin
Test: m redfin_vf, merge with R vendor half
Change-Id: I1b9bbd9b4a723d2479023d1025ef22905e1bc9a1
parent cedd77cc

Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -33,3 +33,12 @@ license { 
    ],

    // large-scale-change unable to identify any license_text files

}



vintf_compatibility_matrix {

    name: "redfin_product_compatibility_matrix.xml",

    stem: "compatibility_matrix.redfin.xml",

    product_specific: true,

    srcs: [

        "device_framework_matrix_product.xml",

    ],

}

device-redfin.mk

+3 −0
Original line number Diff line number Diff line
@@ -237,3 +237,6 @@ PRODUCT_PACKAGES += \ 
# (b/183612348): Enable skia reduceOpsTaskSplitting

PRODUCT_PROPERTY_OVERRIDES += \

    renderthread.skia.reduceopstasksplitting=true



# Include the redfin product FCM

PRODUCT_PACKAGES += redfin_product_compatibility_matrix.xml

device_framework_matrix_product.xml

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

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

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

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

        <name>vendor.google.wireless_charger</name>

        <version>1.3</version>

        <interface>

redfin/BoardConfig.mk

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ else 
  USES_DEVICE_GOOGLE_REDFIN := true



  include device/google/redbull/BoardConfig-common.mk

  DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/redfin/device_framework_matrix_product.xml



  # Testing related defines

  #BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r3-setup.sh