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

Commit 84f51e9f authored by Justin Yun's avatar Justin Yun
Browse files

Merge commit '8f80b6fd' into manual_merge_8f80b6f 

Test: resolve conflict with topic
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
parents 529ac5e0 8f80b6fd

bluetooth/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ cc_library { 
    generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

boot/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ cc_library { 
    generated_headers: ["android.hardware.boot@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

configstore/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ cc_library { 
    generated_headers: ["android.hardware.configstore@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.configstore@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

ir/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ cc_library { 
    generated_headers: ["android.hardware.ir@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.ir@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

nfc/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ cc_library { 
    generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",