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

Commit b6a206b4 authored by Michael Butler's avatar Michael Butler Committed by android-build-merger
Browse files

Change NNAPI VTS to use static library am: 01ba094e am: ba2da6c2 

am: 41b38ee6

Change-Id: I59647f50d647bf90c55fcc27bcc27720a6753b87
parents 0e8c242b 41b38ee6

neuralnetworks/1.0/vts/functional/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -75,7 +75,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}
@@ -84,7 +86,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

neuralnetworks/1.1/vts/functional/Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ cc_defaults { 
cc_test {

    name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}
@@ -60,7 +60,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

}
@@ -69,7 +71,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

neuralnetworks/1.2/vts/functional/Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -53,9 +53,11 @@ cc_test { 
    name: "VtsHalNeuralnetworksV1_2CompatV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}



// Tests for V1_1 models using the V1_2 HAL.
@@ -63,9 +65,11 @@ cc_test { 
    name: "VtsHalNeuralnetworksV1_2CompatV1_1TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

}



// Tests for V1_2 models.
@@ -74,11 +78,13 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_2_all_generated_tests",

        ":VtsHalNeuralNetworksV1_2_mobilenets",

        "CompilationCachingTests.cpp",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_2_example",

    ],

}



cc_test {
@@ -86,9 +92,13 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_2_all_generated_tests",

        ":VtsHalNeuralNetworksV1_2_mobilenets",

        "CompilationCachingTests.cpp",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_2_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

    ],