mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
abc86918ae
Reason for revert: rollforward fix of this topic
This change is a revert of I3d3ac4745, which itself is a revert of
I74f1798e8.
This CL modifies the AIDL utils libraries to be explicitly
versioned. Currently, we only have two versions: v1 and "current".
Specifically, the following changes are made:
- Remove AIDL dependencies from neuralnetworks_utils_hal_common
- Create explicitly versioned libs of neuralnetworks_utils_hal_aidl*
This is needed because it is not allowed for a build target to
link against multiple versions of the same AIDL lirary.
The canonical driver will report ANDROID_S for AIDL v1, and FL6 for v2.
Reverted Changes:
I2aefa0023:Revert "Use explicitly versioned NNAPI HAL util li...
Ia7df07ab9:Revert "Add neuralnetworks_utils_hal_aidl_v2 to al...
Iadd823460:Revert "Provide explicitly version NNAPI AIDL util...
I3d3ac4745:Revert "Provide explicitly versioned NNAPI AIDL ut...
Bug: 202405342
Test: NNT_static
Test: CtsNNAPITestCases
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ib3b732aa406f6d37e8f941082807c9232720c909
Merged-In: Ib3b732aa406f6d37e8f941082807c9232720c909
(cherry picked from commit 478a78ea77)
64 lines
1.9 KiB
Plaintext
64 lines
1.9 KiB
Plaintext
//
|
|
// Copyright (C) 2020 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package {
|
|
// See: http://go/android-license-faq
|
|
// A large-scale-change added 'default_applicable_licenses' to import
|
|
// all of the 'license_kinds' from "hardware_interfaces_license"
|
|
// to get the below license kinds:
|
|
// SPDX-license-identifier-Apache-2.0
|
|
default_applicable_licenses: ["hardware_interfaces_license"],
|
|
}
|
|
|
|
cc_library_static {
|
|
name: "neuralnetworks_utils_hal_common",
|
|
defaults: ["neuralnetworks_utils_defaults"],
|
|
srcs: ["src/*"],
|
|
local_include_dirs: ["include/nnapi/hal"],
|
|
export_include_dirs: ["include"],
|
|
cflags: ["-Wthread-safety"],
|
|
static_libs: ["neuralnetworks_types"],
|
|
}
|
|
|
|
cc_test {
|
|
name: "neuralnetworks_utils_hal_common_test",
|
|
host_supported: true,
|
|
srcs: ["test/*.cpp"],
|
|
static_libs: [
|
|
"libgmock",
|
|
"libneuralnetworks_common_hidl",
|
|
"neuralnetworks_types",
|
|
"neuralnetworks_utils_hal_common",
|
|
],
|
|
shared_libs: [
|
|
"android.hidl.allocator@1.0",
|
|
"android.hidl.memory@1.0",
|
|
"libbase",
|
|
"libcutils",
|
|
"libfmq",
|
|
"libhidlbase",
|
|
"libhidlmemory",
|
|
"liblog",
|
|
"libutils",
|
|
],
|
|
target: {
|
|
android: {
|
|
shared_libs: ["libnativewindow"],
|
|
},
|
|
},
|
|
test_suites: ["general-tests"],
|
|
}
|