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

Commit 79069b19 authored by Tri Vo's avatar Tri Vo Committed by Android (Google) Code Review
Browse files

Merge changes I931dafbb,I845672b2 into oc-mr1-dev 

* changes:
  Thermal 1.1 test statically links to hal def libs.
  Update thermal hal Android.bp.
parents 8d2d1d08 a1b981b7

thermal/1.1/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -42,13 +42,16 @@ genrule { 
    ],

}



cc_library_shared {

cc_library {

    name: "android.hardware.thermal@1.1",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.thermal@1.1_genc++"],

    generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],

    export_generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

thermal/1.1/vts/functional/Android.bp

+2 −11
Original line number Diff line number Diff line
@@ -16,20 +16,11 @@ 


cc_test {

    name: "VtsHalThermalV1_1TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalThermalV1_1TargetTest.cpp"],

    shared_libs: [

        "liblog",

        "libhidlbase",

        "libhidltransport",

        "libutils",

    static_libs: [

        "android.hardware.thermal@1.0",

        "android.hardware.thermal@1.1",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

}