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

Commit 2ca858a4 authored by David Gross's avatar David Gross Committed by Android (Google) Code Review
Browse files

Merge "redefine _Float16 as __fp16 for x86[_64] to allow removing workaround from inhouse clang"

parents c124b39f 2452ee5a

neuralnetworks/1.0/vts/functional/Android.bp

+19 −2
Original line number Diff line number Diff line
@@ -14,13 +14,30 @@ 
// limitations under the License.

//



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" ],

        },

    },

}



cc_library_static {

    name: "VtsHalNeuralNetworksV1_0_utils",

    srcs: [

        "Callbacks.cpp",

        "Utils.cpp",

    ],

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    export_include_dirs: ["include"],

    shared_libs: [

        "libfmq",
@@ -42,7 +59,7 @@ cc_library_static { 


cc_test {

    name: "VtsHalNeuralnetworksV1_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "TestAssertions.cpp",

neuralnetworks/1.1/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


cc_test {

    name: "VtsHalNeuralnetworksV1_1TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "TestAssertions.cpp",

neuralnetworks/1.2/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


cc_library_static {

    name: "VtsHalNeuralNetworksV1_2Callbacks",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    export_include_dirs: ["include"],

    srcs: [

        "Callbacks.cpp",
@@ -33,7 +33,7 @@ cc_library_static { 


cc_test {

    name: "VtsHalNeuralnetworksV1_2TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "CompilationCachingTests.cpp",

neuralnetworks/1.3/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


cc_library_static {

    name: "VtsHalNeuralNetworksV1_3_utils",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    export_include_dirs: ["include"],

    srcs: [

        "Callbacks.cpp",
@@ -35,7 +35,7 @@ cc_library_static { 


cc_test {

    name: "VtsHalNeuralnetworksV1_3TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "CompilationCachingTests.cpp",