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

Commit 75199602 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Making NN hardware interface libs "host supported""

parents 13cddcb2 a6d60024

neuralnetworks/1.0/utils/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ cc_library_static { 


cc_test {

    name: "neuralnetworks_utils_hal_1_0_test",

    host_supported: true,

    srcs: ["test/*.cpp"],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",
@@ -62,8 +63,12 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}

neuralnetworks/1.0/vts/functional/Android.bp

+9 −15
Original line number Diff line number Diff line
@@ -25,19 +25,10 @@ package { 


cc_defaults {

    name: "neuralnetworks_vts_functional_defaults",

    defaults: ["VtsHalTargetTestDefaults"],

    arch: {

        x86: {

            cflags: [ "-D_Float16=__fp16",

                      "-Xclang", "-fnative-half-type",

                      "-Xclang", "-fallow-half-arguments-and-returns" ],

        },

        x86_64: {

            cflags: [ "-D_Float16=__fp16",

                      "-Xclang", "-fnative-half-type",

                      "-Xclang", "-fallow-half-arguments-and-returns" ],

        },

    },

    defaults: [

        "VtsHalTargetTestDefaults",

        "neuralnetworks_float16",

    ],

}



cc_library_static {
@@ -83,6 +74,7 @@ cc_test { 
        "libnativewindow",

    ],

    static_libs: [

        "VtsHalNeuralNetworksV1_0_utils",

        "android.hardware.neuralnetworks@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",
@@ -90,7 +82,6 @@ cc_test { 
        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",
@@ -98,5 +89,8 @@ cc_test { 
    header_libs: [

        "libneuralnetworks_headers",

    ],

    test_suites: ["general-tests", "vts"],

    test_suites: [

        "general-tests",

        "vts",

    ],

}

neuralnetworks/1.1/utils/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ cc_library_static { 


cc_test {

    name: "neuralnetworks_utils_hal_1_1_test",

    host_supported: true,

    srcs: ["test/*.cpp"],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",
@@ -66,8 +67,12 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}

neuralnetworks/1.1/vts/functional/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -28,18 +28,19 @@ cc_test { 
    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestHarness.cpp",

        "TestAssertions.cpp",

        "TestMain.cpp",

        "ValidateModel.cpp",

        "ValidateRequest.cpp",

        "VtsHalNeuralnetworks.cpp",

        "GeneratedTestHarness.cpp",

    ],

    shared_libs: [

        "libfmq",

        "libnativewindow",

    ],

    static_libs: [

        "VtsHalNeuralNetworksV1_0_utils",

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hidl.allocator@1.0",
@@ -48,7 +49,6 @@ cc_test { 
        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",
@@ -57,5 +57,8 @@ cc_test { 
    header_libs: [

        "libneuralnetworks_headers",

    ],

    test_suites: ["general-tests", "vts"],

    test_suites: [

        "general-tests",

        "vts",

    ],

}

neuralnetworks/1.2/utils/Android.bp

+16 −1
Original line number Diff line number Diff line
@@ -50,10 +50,21 @@ cc_library_static { 
            cflags: ["-DNN_DEBUGGABLE"],

        },

    },

    target: {

        host: {

            cflags: [

                "-D__INTRODUCED_IN(x)=",

                "-D__assert(a,b,c)=",

                // We want all the APIs to be available on the host.

                "-D__ANDROID_API__=10000",

            ],

        },

    },

}



cc_test {

    name: "neuralnetworks_utils_hal_1_2_test",

    host_supported: true,

    srcs: ["test/*.cpp"],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",
@@ -76,8 +87,12 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}