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

Commit c02e8629 authored by Michael Butler's avatar Michael Butler Committed by Android (Google) Code Review
Browse files

Merge "Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL.""

parents 612a1668 932e82b0

neuralnetworks/1.0/utils/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ cc_test { 
    static_libs: [

        "android.hardware.neuralnetworks@1.0",

        "libgmock",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

neuralnetworks/1.0/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ cc_library_static { 
        "libgmock",

        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_utils",

    ],

    header_libs: [

        "libneuralnetworks_headers",
@@ -81,7 +81,7 @@ cc_test { 
        "libgmock",

        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_utils",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

neuralnetworks/1.1/utils/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ cc_test { 
        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "libgmock",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",

neuralnetworks/1.1/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ cc_test { 
        "libgmock",

        "libhidlmemory",

        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_utils",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

neuralnetworks/1.2/utils/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ cc_test { 
        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "libgmock",

        "libneuralnetworks_common_hidl",

        "libneuralnetworks_common",

        "neuralnetworks_types",

        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_1_0",