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

Commit ea89e304 authored by Ray Hernandez's avatar Ray Hernandez
Browse files

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

Revert "Making NNAPI libraries and tests host supported"

Revert submission 1769046-neuralnetworks_host_build

Reason for revert: New Build Breakage
Reverted Changes:
Ib54d5c274:Making NNAPI libraries and tests host supported
I1d7c66516:Making NN hardware interface libs "host supported"...

Change-Id: I6f65774325889c50b9f8bbab13b557705419b6cf
parent a6d60024

neuralnetworks/1.0/utils/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 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",
@@ -63,12 +62,8 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}

neuralnetworks/1.0/vts/functional/Android.bp

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


cc_defaults {

    name: "neuralnetworks_vts_functional_defaults",

    defaults: [

        "VtsHalTargetTestDefaults",

        "neuralnetworks_float16",

    ],

    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 {
@@ -74,7 +83,6 @@ cc_test { 
        "libnativewindow",

    ],

    static_libs: [

        "VtsHalNeuralNetworksV1_0_utils",

        "android.hardware.neuralnetworks@1.0",

        "android.hidl.allocator@1.0",

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

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

    ],

    whole_static_libs: [

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

        "libneuralnetworks_headers",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

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

}

neuralnetworks/1.1/utils/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 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",
@@ -67,12 +66,8 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}

neuralnetworks/1.1/vts/functional/Android.bp

+3 −6
Original line number Diff line number Diff line
@@ -28,19 +28,18 @@ 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",
@@ -49,6 +48,7 @@ cc_test { 
        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

    ],

    whole_static_libs: [

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

        "libneuralnetworks_headers",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

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

}

neuralnetworks/1.2/utils/Android.bp

+1 −16
Original line number Diff line number Diff line
@@ -50,21 +50,10 @@ 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",
@@ -87,12 +76,8 @@ cc_test { 
        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libnativewindow",

        "libutils",

    ],

    target: {

        android: {

            shared_libs: ["libnativewindow"],

        },

    },

    test_suites: ["general-tests"],

}