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

Commit 6ee712d6 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "remove libbinder_ndk_host_user" am: ee22878a 

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

Change-Id: I33753c04d917ebfe3f9efa8548dd796c942f563d
parents b7664965 ee22878a

common/support/Android.bp

+10 −2
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ cc_library_static { 
    name: "libaidlcommonsupport",

    vendor_available: true,

    host_supported: true,

    defaults: ["libbinder_ndk_host_user"],

    target: {

        darwin: {

            enabled: false,

        },

    },

    srcs: ["NativeHandle.cpp"],

    export_include_dirs: ["include"],

    shared_libs: [
@@ -28,7 +32,11 @@ cc_library_static { 
cc_test {

    name: "libaidlcommonsupport_test",

    host_supported: true,

    defaults: ["libbinder_ndk_host_user"],

    target: {

        darwin: {

            enabled: false,

        },

    },

    srcs: ["test.cpp"],

    static_libs: [

        "android.hardware.common-V2-ndk",

health/aidl/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -62,9 +62,11 @@ cc_library { 
        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

    ],

    defaults: [

        "libbinder_ndk_host_user",

    ],

    target: {

        darwin: {

            enabled: false,

        },

    },

}



java_library {

health/utils/libhealthshim/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ package { 
cc_defaults {

    name: "libhealthshim_defaults",

    host_supported: true, // for testing

    defaults: [

        "libbinder_ndk_host_user",

    ],

    target: {

        darwin: {

            enabled: false,

        },

    },

    cflags: [

        "-Wall",

        "-Werror",