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

Commit fd0636d1 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Cleanup NN utility libraries' dependencies" am: d3e413e7 

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

Change-Id: I54f8f522af67cbf1828cecc8951c42379279eaae
parents 98034210 d3e413e7

neuralnetworks/1.0/utils/Android.bp

+1 −11
Original line number Diff line number Diff line
@@ -31,16 +31,11 @@ cc_library_static { 
    export_include_dirs: ["include"],

    cflags: ["-Wthread-safety"],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",

        "libarect",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

    ],

    shared_libs: [

        "android.hardware.neuralnetworks@1.0",

    ],

    export_static_lib_headers: [

        "neuralnetworks_utils_hal_common",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],
@@ -55,19 +50,14 @@ cc_test { 
    static_libs: [

        "android.hardware.neuralnetworks@1.0",

        "libgmock",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

    ],

    shared_libs: [

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libutils",

    ],

neuralnetworks/1.1/utils/Android.bp

+2 −12
Original line number Diff line number Diff line
@@ -31,16 +31,11 @@ cc_library_static { 
    export_include_dirs: ["include"],

    cflags: ["-Wthread-safety"],

    static_libs: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

    ],

    shared_libs: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

    ],

    export_static_lib_headers: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

    ],

}
@@ -52,20 +47,15 @@ cc_test { 
        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "libgmock",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

        "neuralnetworks_utils_hal_1_1",

    ],

    shared_libs: [

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libutils",

    ],

neuralnetworks/1.2/utils/Android.bp

+3 −12
Original line number Diff line number Diff line
@@ -31,19 +31,14 @@ cc_library_static { 
    export_include_dirs: ["include"],

    cflags: ["-Wthread-safety"],

    static_libs: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

        "neuralnetworks_utils_hal_1_1",

    ],

    shared_libs: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "libfmq",

    ],

    export_static_lib_headers: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

        "neuralnetworks_utils_hal_1_1",

    ],

    product_variables: {

        debuggable: { // eng and userdebug builds
@@ -71,7 +66,6 @@ cc_test { 
        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "libgmock",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",
@@ -79,13 +73,10 @@ cc_test { 
        "neuralnetworks_utils_hal_1_2",

    ],

    shared_libs: [

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libutils",

    ],

neuralnetworks/1.3/utils/Android.bp

+4 −13
Original line number Diff line number Diff line
@@ -31,21 +31,16 @@ cc_library_static { 
    export_include_dirs: ["include"],

    cflags: ["-Wthread-safety"],

    static_libs: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

        "neuralnetworks_utils_hal_1_1",

        "neuralnetworks_utils_hal_1_2",

    ],

    shared_libs: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "android.hardware.neuralnetworks@1.3",

        "libfmq",

    ],

    export_static_lib_headers: [

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

        "neuralnetworks_utils_hal_1_1",

        "neuralnetworks_utils_hal_1_2",

    ],

    target: {

        host: {
@@ -69,7 +64,6 @@ cc_test { 
        "android.hardware.neuralnetworks@1.2",

        "android.hardware.neuralnetworks@1.3",

        "libgmock",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",
@@ -78,13 +72,10 @@ cc_test { 
        "neuralnetworks_utils_hal_1_3",

    ],

    shared_libs: [

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libbase",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libutils",

    ],

neuralnetworks/aidl/utils/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -111,19 +111,13 @@ cc_test { 
    static_libs: [

        "libaidlcommonsupport",

        "libgmock",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

    ],

    shared_libs: [

        "android.hidl.allocator@1.0",

        "libbase",

        "libbinder_ndk",

        "libcutils",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libutils",

    ],

    target: {

        android: {