Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 13:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Vehicle HAL under automotive package

Browse Source 
Test: verified unit tests and VTS are passing

Bug: b/33200203
Change-Id: I69cc4bc0d4cbc1a6bf2f77564a8f70412fe06947
This commit is contained in:
Pavel Maltsev
2017-02-02 12:39:36 -08:00
parent afe76f2784
commit 2579fb792b
40 changed files with 625 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
automotive/Android.bp Normal file
View File

@@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"vehicle",
"vehicle/2.0",
]

175
automotive/vehicle/2.0/Android.bp Normal file
View File

@@ -0,0 +1,175 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
genrule {
name: "android.hardware.automotive.vehicle@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.cpp",
"android/hardware/automotive/vehicle/2.0/VehicleAll.cpp",
"android/hardware/automotive/vehicle/2.0/VehicleCallbackAll.cpp",
],
}
genrule {
name: "android.hardware.automotive.vehicle@2.0_genc++_headers",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.h",
"android/hardware/automotive/vehicle/2.0/IVehicle.h",
"android/hardware/automotive/vehicle/2.0/IHwVehicle.h",
"android/hardware/automotive/vehicle/2.0/BnHwVehicle.h",
"android/hardware/automotive/vehicle/2.0/BpHwVehicle.h",
"android/hardware/automotive/vehicle/2.0/BsVehicle.h",
"android/hardware/automotive/vehicle/2.0/IVehicleCallback.h",
"android/hardware/automotive/vehicle/2.0/IHwVehicleCallback.h",
"android/hardware/automotive/vehicle/2.0/BnHwVehicleCallback.h",
"android/hardware/automotive/vehicle/2.0/BpHwVehicleCallback.h",
"android/hardware/automotive/vehicle/2.0/BsVehicleCallback.h",
],
}
cc_library_shared {
name: "android.hardware.automotive.vehicle@2.0",
generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"],
generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}
genrule {
name: "android.hardware.automotive.vehicle.vts.driver@2.0_genc++",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.vts.cpp",
"android/hardware/automotive/vehicle/2.0/Vehicle.vts.cpp",
"android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",
],
}
genrule {
name: "android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.vts.h",
"android/hardware/automotive/vehicle/2.0/Vehicle.vts.h",
"android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",
],
}
cc_library_shared {
name: "android.hardware.automotive.vehicle.vts.driver@2.0",
generated_sources: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++"],
generated_headers: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.vehicle.vts.driver@2.0_genc++_headers"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"libvts_common",
"libvts_datatype",
"libvts_measurement",
"libvts_multidevice_proto",
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hidl.base@1.0",
"android.hardware.automotive.vehicle@2.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}
genrule {
name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.vts.cpp",
"android/hardware/automotive/vehicle/2.0/Vehicle.vts.cpp",
"android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",
],
}
genrule {
name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/automotive/vehicle/2.0/types.vts.h",
"android/hardware/automotive/vehicle/2.0/Vehicle.vts.h",
"android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",
],
}
cc_library_shared {
name: "android.hardware.automotive.vehicle@2.0-vts.profiler",
generated_sources: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
"libhidlbase",
"libhidltransport",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hidl.base@1.0",
"android.hardware.automotive.vehicle@2.0",
],
}

492
vehicle/2.0/Android.mk → automotive/vehicle/2.0/Android.mk
View File

File diff suppressed because it is too large Load Diff

2
vehicle/2.0/IVehicle.hal → automotive/vehicle/2.0/IVehicle.hal
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.vehicle@2.0;
package android.hardware.automotive.vehicle@2.0;
import IVehicleCallback;

2
vehicle/2.0/IVehicleCallback.hal → automotive/vehicle/2.0/IVehicleCallback.hal
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.vehicle@2.0;
package android.hardware.automotive.vehicle@2.0;
interface IVehicleCallback {

4
vehicle/2.0/default/Android.mk → automotive/vehicle/2.0/default/Android.mk
View File

@@ -14,7 +14,7 @@
LOCAL_PATH := $(call my-dir)
module_prefix = android.hardware.vehicle@2.0
module_prefix = android.hardware.automotive.vehicle@2.0
###############################################################################
# Vehicle reference implementation lib
@@ -115,6 +115,6 @@ LOCAL_SHARED_LIBRARIES := \
libhwbinder \
liblog \
libutils \
android.hardware.vehicle@2.0
$(module_prefix) \
include $(BUILD_EXECUTABLE)

10
vehicle/2.0/default/VehicleHal.h → automotive/vehicle/2.0/default/VehicleHal.h
View File

@@ -14,15 +14,16 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_VehicleHal_H_
#define android_hardware_vehicle_V2_0_VehicleHal_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehicleHal_H
#define android_hardware_automotive_vehicle_V2_0_VehicleHal_H
#include <android/hardware/vehicle/2.0/IVehicle.h>
#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include "vehicle_hal_manager/VehicleObjectPool.h"
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -108,7 +109,8 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif //android_hardware_vehicle_V2_0_VehicleHal_H_
#endif //android_hardware_automotive_vehicle_V2_0_VehicleHal_H_

4
vehicle/2.0/default/VehicleService.cpp → automotive/vehicle/2.0/default/VehicleService.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-service"
#define LOG_TAG "automotive.vehicle@2.0-service"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
@@ -26,7 +26,7 @@
using namespace android;
using namespace android::hardware;
using namespace android::hardware::vehicle::V2_0;
using namespace android::hardware::automotive::vehicle::V2_0;
int main(int /* argc */, char* /* argv */ []) {
auto hal = std::make_unique<impl::DefaultVehicleHal>();

4
automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc Normal file
View File

@@ -0,0 +1,4 @@
service vehicle-hal-2.0 /system/bin/hw/android.hardware.automotive.vehicle@2.0-service
class hal
user vehicle_network
group system

10
vehicle/2.0/default/impl/DefaultConfig.h → automotive/vehicle/2.0/default/impl/DefaultConfig.h
View File

@@ -14,14 +14,15 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
#define android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
#ifndef android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_
#define android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_
#include <android/hardware/vehicle/2.0/IVehicle.h>
#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include <vehicle_hal_manager/VehicleUtils.h>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -180,7 +181,8 @@ const VehiclePropConfig kVehicleProperties[] = {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
#endif // android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_

2
vehicle/2.0/default/impl/DefaultVehicleHal.cpp → automotive/vehicle/2.0/default/impl/DefaultVehicleHal.cpp
View File

@@ -23,6 +23,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -317,5 +318,6 @@ StatusCode DefaultVehicleHal::fillObd2FreezeFrame(VehiclePropValuePtr* v) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

8
vehicle/2.0/default/impl/DefaultVehicleHal.h → automotive/vehicle/2.0/default/impl/DefaultVehicleHal.h
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
#define android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
#ifndef android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
#define android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
#include <memory>
@@ -26,6 +26,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -83,8 +84,9 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
#endif // android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_

2
vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp → automotive/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
View File

@@ -24,6 +24,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -146,5 +147,6 @@ TEST_F(AccessControlConfigParserTest, multipleCalls) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

2
vehicle/2.0/default/tests/Obd2SensorStore_test.cpp → automotive/vehicle/2.0/default/tests/Obd2SensorStore_test.cpp
View File

@@ -21,6 +21,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -279,5 +280,6 @@ TEST(Obd2SensorStoreTest, setVendorFloatSensor) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

2
vehicle/2.0/default/tests/SubscriptionManager_test.cpp → automotive/vehicle/2.0/default/tests/SubscriptionManager_test.cpp
View File

@@ -25,6 +25,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -192,5 +193,6 @@ TEST_F(SubscriptionManagerTest, unsubscribe) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

2
vehicle/2.0/default/tests/VehicleHalManager_test.cpp → automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
View File

@@ -27,6 +27,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -471,5 +472,6 @@ TEST(HalClientVectorTest, basic) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

12
vehicle/2.0/default/tests/VehicleHalTestUtils.h → automotive/vehicle/2.0/default/tests/VehicleHalTestUtils.h
View File

@@ -14,16 +14,17 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_VehicleDebugUtils_H_
#define android_hardware_vehicle_V2_0_VehicleDebugUtils_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_
#define android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_
#include <android/hardware/vehicle/2.0/types.h>
#include <android/hardware/automotive/vehicle/2.0/types.h>
#include <vehicle_hal_manager/VehicleUtils.h>
#include <ios>
#include <sstream>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -120,7 +121,7 @@ private:
using MuxGuard = std::lock_guard<std::mutex>;
using HidlVecOfValues = hidl_vec<VehiclePropValue>;
public:
// Methods from ::android::hardware::vehicle::V2_0::IVehicleCallback follow.
// Methods from ::android::hardware::automotive::vehicle::V2_0::IVehicleCallback follow.
Return<void> onPropertyEvent(
const hidl_vec<VehiclePropValue>& values) override {
{
@@ -265,8 +266,9 @@ inline std::string toString(const VehiclePropConfig &config) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif //VEHICLEHALDEBUGUTILS_H
#endif //android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_

2
vehicle/2.0/default/tests/VehicleObjectPool_test.cpp → automotive/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
View File

@@ -24,6 +24,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -125,5 +126,6 @@ TEST_F(VehicleObjectPoolTest, valuePoolMultithreadedBenchmark) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

4
vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp → automotive/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
View File

@@ -22,6 +22,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -71,5 +72,6 @@ TEST_F(PropConfigTest, getConfigs) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
} // namespace android

4
vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-impl"
#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "AccessControlConfigParser.h"
#include "VehicleUtils.h"
@@ -27,6 +27,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -222,5 +223,6 @@ std::string AccessControlConfigParser::readNextToken(
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

10
vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.h → automotive/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.h
View File

@@ -14,18 +14,19 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
#define android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
#ifndef android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_
#define android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_
#include <string>
#include <vector>
#include <unordered_map>
#include <list>
#include <android/hardware/vehicle/2.0/types.h>
#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -105,7 +106,8 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
#endif // android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_

6
vehicle/2.0/default/vehicle_hal_manager/ConcurrentQueue.h → automotive/vehicle/2.0/default/vehicle_hal_manager/ConcurrentQueue.h
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_ConcurrentQueue_H_
#define android_hardware_vehicle_V2_0_ConcurrentQueue_H_
#ifndef android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_
#define android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_
#include <queue>
#include <atomic>
@@ -153,4 +153,4 @@ private:
} // namespace android
#endif //android_hardware_vehicle_V2_0_ConcurrentQueue_H_
#endif //android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_

2
vehicle/2.0/default/vehicle_hal_manager/Obd2SensorStore.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/Obd2SensorStore.cpp
View File

@@ -20,6 +20,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -100,5 +101,6 @@ const std::vector<uint8_t>& Obd2SensorStore::getSensorsBitmask() const {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

8
vehicle/2.0/default/vehicle_hal_manager/Obd2SensorStore.h → automotive/vehicle/2.0/default/vehicle_hal_manager/Obd2SensorStore.h
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_Obd2SensorStore_H_
#define android_hardware_vehicle_V2_0_Obd2SensorStore_H_
#ifndef android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
#define android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
#include <vector>
@@ -23,6 +23,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -74,7 +75,8 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_Obd2SensorStore_H_
#endif // android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_

4
vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-impl"
#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "SubscriptionManager.h"
@@ -26,6 +26,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -254,5 +255,6 @@ bool SubscriptionManager::unsubscribe(const sp<IVehicleCallback>& callback,
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

10
vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h → automotive/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_SubscriptionManager_H_
#define android_hardware_vehicle_V2_0_SubscriptionManager_H_
#ifndef android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_
#define android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_
#include <memory>
#include <map>
@@ -25,13 +25,14 @@
#include <android/log.h>
#include <hwbinder/IPCThreadState.h>
#include <android/hardware/vehicle/2.0/IVehicle.h>
#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include "ConcurrentQueue.h"
#include "VehicleObjectPool.h"
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -140,8 +141,9 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_SubscriptionManager_H_
#endif // android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_

4
vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-impl"
#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleHalManager.h"
@@ -27,6 +27,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -380,5 +381,6 @@ void VehicleHalManager::readAndParseAclConfig(const char* filename,
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

10
vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.h → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.h
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_VehicleHalManager_H_
#define android_hardware_vehicle_V2_0_VehicleHalManager_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_
#define android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_
#include <inttypes.h>
#include <stdint.h>
@@ -26,7 +26,7 @@
#include <memory>
#include <set>
#include <android/hardware/vehicle/2.0/IVehicle.h>
#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include <hwbinder/IPCThreadState.h>
#include "AccessControlConfigParser.h"
@@ -38,6 +38,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -130,8 +131,9 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_VehicleHalManager_H_
#endif // android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_

4
vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-impl"
#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleObjectPool.h"
@@ -24,6 +24,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -157,5 +158,6 @@ VehiclePropValue* VehiclePropValuePool::InternalPool::createObject() {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

10
vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h
View File

@@ -15,17 +15,18 @@
*/
#ifndef android_hardware_vehicle_V2_0_VehicleObjectPool_H_
#define android_hardware_vehicle_V2_0_VehicleObjectPool_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_
#define android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_
#include <deque>
#include <map>
#include <mutex>
#include <android/hardware/vehicle/2.0/types.h>
#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -238,7 +239,8 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_VehicleObjectPool_H_
#endif // android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_

10
vehicle/2.0/default/vehicle_hal_manager/VehiclePropConfigIndex.h → automotive/vehicle/2.0/default/vehicle_hal_manager/VehiclePropConfigIndex.h
View File

@@ -14,15 +14,16 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
#define android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_
#define android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_
#include <utils/KeyedVector.h>
#include <android/hardware/vehicle/2.0/IVehicle.h>
#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -72,7 +73,8 @@ private:
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
#endif // android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_

4
vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.cpp → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vehicle@2.0-impl"
#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleUtils.h"
@@ -22,6 +22,7 @@
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -124,5 +125,6 @@ void shallowCopy(VehiclePropValue* dest, const VehiclePropValue& src) {
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android

10
vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h → automotive/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h
View File

@@ -14,17 +14,18 @@
* limitations under the License.
*/
#ifndef android_hardware_vehicle_V2_0_VehicleUtils_H_
#define android_hardware_vehicle_V2_0_VehicleUtils_H_
#ifndef android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_
#define android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_
#include <memory>
#include <hidl/HidlSupport.h>
#include <android/hardware/vehicle/2.0/types.h>
#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -78,7 +79,8 @@ void shallowCopy(VehiclePropValue* dest, const VehiclePropValue& src);
} // namespace V2_0
} // namespace vehicle
} // namespace automotive
} // namespace hardware
} // namespace android
#endif // android_hardware_vehicle_V2_0_VehicleUtils_H_
#endif // android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_

2
vehicle/2.0/types.hal → automotive/vehicle/2.0/types.hal
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.vehicle@2.0;
package android.hardware.automotive.vehicle@2.0;
/*
* Enumerates supported data types for VehicleProperty.

32
vehicle/2.0/vts/Vehicle.vts → automotive/vehicle/2.0/vts/Vehicle.vts
View File

@@ -2,10 +2,10 @@ component_class: HAL_HIDL
component_type_version: 2.0
component_name: "IVehicle"
package: "android.hardware.vehicle"
package: "android.hardware.automotive.vehicle"
import: "android.hardware.vehicle@2.0::IVehicleCallback"
import: "android.hardware.vehicle@2.0::types"
import: "android.hardware.automotive.vehicle@2.0::IVehicleCallback"
import: "android.hardware.automotive.vehicle@2.0::types"
interface: {
api: {
@@ -14,7 +14,7 @@ interface: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
}
}
}
@@ -23,20 +23,20 @@ interface: {
name: "getPropConfigs"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
return_type_hidl: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
}
}
arg: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
}
}
@@ -45,15 +45,15 @@ interface: {
name: "get"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
return_type_hidl: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
}
arg: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
}
}
@@ -61,11 +61,11 @@ interface: {
name: "set"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
arg: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
}
}
@@ -73,7 +73,7 @@ interface: {
name: "subscribe"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
arg: {
type: TYPE_HIDL_CALLBACK
@@ -84,7 +84,7 @@ interface: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::SubscribeOptions"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::SubscribeOptions"
}
}
}
@@ -93,7 +93,7 @@ interface: {
name: "unsubscribe"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
arg: {
type: TYPE_HIDL_CALLBACK
@@ -102,7 +102,7 @@ interface: {
}
arg: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
}

12
vehicle/2.0/vts/VehicleCallback.vts → automotive/vehicle/2.0/vts/VehicleCallback.vts
View File

@@ -2,9 +2,9 @@ component_class: HAL_HIDL
component_type_version: 2.0
component_name: "IVehicleCallback"
package: "android.hardware.vehicle"
package: "android.hardware.automotive.vehicle"
import: "android.hardware.vehicle@2.0::types"
import: "android.hardware.automotive.vehicle@2.0::types"
interface: {
api: {
@@ -13,7 +13,7 @@ interface: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
}
}
}
@@ -22,7 +22,7 @@ interface: {
name: "onPropertySet"
arg: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
}
}
@@ -30,11 +30,11 @@ interface: {
name: "onPropertySetError"
arg: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
}
arg: {
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
arg: {
type: TYPE_SCALAR

132
vehicle/2.0/vts/types.vts → automotive/vehicle/2.0/vts/types.vts
View File

@@ -2,11 +2,11 @@ component_class: HAL_HIDL
component_type_version: 2.0
component_name: "types"
package: "android.hardware.vehicle"
package: "android.hardware.automotive.vehicle"
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropertyType"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -55,7 +55,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleArea"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleArea"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -92,7 +92,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropertyGroup"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyGroup"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -113,7 +113,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleProperty"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -510,7 +510,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleHvacFanDirection"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleHvacFanDirection"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -539,7 +539,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleRadioConstants"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleRadioConstants"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -552,7 +552,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusRequest"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusRequest"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -581,7 +581,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusState"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -614,7 +614,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioStreamFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioStreamFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -635,7 +635,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioStream"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioStream"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -652,7 +652,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioExtFocusFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioExtFocusFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -681,7 +681,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusIndex"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -706,7 +706,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioContextFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioContextFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -767,7 +767,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeCapabilityFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeCapabilityFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -784,7 +784,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeState"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -801,7 +801,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeIndex"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -822,7 +822,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeLimitIndex"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeLimitIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -839,7 +839,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioRoutingPolicyIndex"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioRoutingPolicyIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -856,7 +856,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAudioHwVariantConfigFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioHwVariantConfigFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -869,7 +869,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateConfigFlag"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateConfigFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -886,7 +886,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerState"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -915,7 +915,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateShutdownParam"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -936,7 +936,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerSetState"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerSetState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -973,7 +973,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateIndex"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -990,7 +990,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleApPowerBootupReason"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerBootupReason"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1011,7 +1011,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleHwKeyInputAction"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleHwKeyInputAction"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1028,7 +1028,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleDisplay"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleDisplay"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1045,7 +1045,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleInstrumentClusterType"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleInstrumentClusterType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1066,7 +1066,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleUnit"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleUnit"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1135,7 +1135,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropertyChangeMode"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyChangeMode"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1164,7 +1164,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropertyAccess"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyAccess"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1189,7 +1189,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleDrivingStatus"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleDrivingStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1222,7 +1222,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleGear"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleGear"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1287,7 +1287,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaZone"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaZone"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1364,7 +1364,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaSeat"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaSeat"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1409,7 +1409,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaWindow"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaWindow"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1454,7 +1454,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaDoor"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaDoor"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1495,7 +1495,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaMirror"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaMirror"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1516,7 +1516,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleTurnSignal"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleTurnSignal"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1541,7 +1541,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleAreaConfig"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaConfig"
type: TYPE_STRUCT
struct_value: {
name: "areaId"
@@ -1581,22 +1581,22 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
type: TYPE_STRUCT
struct_value: {
name: "prop"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
struct_value: {
name: "access"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropertyAccess"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyAccess"
}
struct_value: {
name: "changeMode"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropertyChangeMode"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyChangeMode"
}
struct_value: {
name: "supportedAreas"
@@ -1608,7 +1608,7 @@ attribute: {
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehicleAreaConfig"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaConfig"
}
}
struct_value: {
@@ -1641,10 +1641,10 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropValue"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
type: TYPE_STRUCT
sub_struct: {
name: "::android::hardware::vehicle::V2_0::VehiclePropValue::RawValue"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue::RawValue"
type: TYPE_STRUCT
struct_value: {
name: "int32Values"
@@ -1686,7 +1686,7 @@ attribute: {
struct_value: {
name: "prop"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
struct_value: {
name: "timestamp"
@@ -1701,12 +1701,12 @@ attribute: {
struct_value: {
name: "value"
type: TYPE_STRUCT
predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue::RawValue"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue::RawValue"
}
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehicleIgnitionState"
name: "::android::hardware::automotive::vehicle::V2_0::VehicleIgnitionState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1739,7 +1739,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::VehiclePropertyOperation"
name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyOperation"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1764,7 +1764,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::SubscribeFlags"
name: "::android::hardware::automotive::vehicle::V2_0::SubscribeFlags"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1789,12 +1789,12 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::SubscribeOptions"
name: "::android::hardware::automotive::vehicle::V2_0::SubscribeOptions"
type: TYPE_STRUCT
struct_value: {
name: "propId"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
}
struct_value: {
name: "vehicleAreas"
@@ -1809,12 +1809,12 @@ attribute: {
struct_value: {
name: "flags"
type: TYPE_ENUM
predefined_type: "::android::hardware::vehicle::V2_0::SubscribeFlags"
predefined_type: "::android::hardware::automotive::vehicle::V2_0::SubscribeFlags"
}
}
attribute: {
name: "::android::hardware::vehicle::V2_0::StatusCode"
name: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1847,7 +1847,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::FuelSystemStatus"
name: "::android::hardware::automotive::vehicle::V2_0::FuelSystemStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1876,7 +1876,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::IgnitionMonitorKind"
name: "::android::hardware::automotive::vehicle::V2_0::IgnitionMonitorKind"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1893,7 +1893,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::CommonIgnitionMonitors"
name: "::android::hardware::automotive::vehicle::V2_0::CommonIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1926,7 +1926,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::SparkIgnitionMonitors"
name: "::android::hardware::automotive::vehicle::V2_0::SparkIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2023,7 +2023,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::CompressionIgnitionMonitors"
name: "::android::hardware::automotive::vehicle::V2_0::CompressionIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2104,7 +2104,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::SecondaryAirStatus"
name: "::android::hardware::automotive::vehicle::V2_0::SecondaryAirStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2129,7 +2129,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::FuelType"
name: "::android::hardware::automotive::vehicle::V2_0::FuelType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2234,7 +2234,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::Obd2IntegerSensorIndex"
name: "::android::hardware::automotive::vehicle::V2_0::Obd2IntegerSensorIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2371,7 +2371,7 @@ attribute: {
}
attribute: {
name: "::android::hardware::vehicle::V2_0::Obd2FloatSensorIndex"
name: "::android::hardware::automotive::vehicle::V2_0::Obd2FloatSensorIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"

0
vehicle/Android.bp → automotive/vehicle/Android.bp
View File

175
vehicle/2.0/Android.bp
View File

@@ -1,175 +0,0 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
genrule {
name: "android.hardware.vehicle@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.cpp",
"android/hardware/vehicle/2.0/VehicleAll.cpp",
"android/hardware/vehicle/2.0/VehicleCallbackAll.cpp",
],
}
genrule {
name: "android.hardware.vehicle@2.0_genc++_headers",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.h",
"android/hardware/vehicle/2.0/IVehicle.h",
"android/hardware/vehicle/2.0/IHwVehicle.h",
"android/hardware/vehicle/2.0/BnHwVehicle.h",
"android/hardware/vehicle/2.0/BpHwVehicle.h",
"android/hardware/vehicle/2.0/BsVehicle.h",
"android/hardware/vehicle/2.0/IVehicleCallback.h",
"android/hardware/vehicle/2.0/IHwVehicleCallback.h",
"android/hardware/vehicle/2.0/BnHwVehicleCallback.h",
"android/hardware/vehicle/2.0/BpHwVehicleCallback.h",
"android/hardware/vehicle/2.0/BsVehicleCallback.h",
],
}
cc_library_shared {
name: "android.hardware.vehicle@2.0",
generated_sources: ["android.hardware.vehicle@2.0_genc++"],
generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}
genrule {
name: "android.hardware.vehicle.vts.driver@2.0_genc++",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.vts.cpp",
"android/hardware/vehicle/2.0/Vehicle.vts.cpp",
"android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",
],
}
genrule {
name: "android.hardware.vehicle.vts.driver@2.0_genc++_headers",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.vts.h",
"android/hardware/vehicle/2.0/Vehicle.vts.h",
"android/hardware/vehicle/2.0/VehicleCallback.vts.h",
],
}
cc_library_shared {
name: "android.hardware.vehicle.vts.driver@2.0",
generated_sources: ["android.hardware.vehicle.vts.driver@2.0_genc++"],
generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"libvts_common",
"libvts_datatype",
"libvts_measurement",
"libvts_multidevice_proto",
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hidl.base@1.0",
"android.hardware.vehicle@2.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}
genrule {
name: "android.hardware.vehicle@2.0-vts.profiler_genc++",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.vts.cpp",
"android/hardware/vehicle/2.0/Vehicle.vts.cpp",
"android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",
],
}
genrule {
name: "android.hardware.vehicle@2.0-vts.profiler_genc++_headers",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
out: [
"android/hardware/vehicle/2.0/types.vts.h",
"android/hardware/vehicle/2.0/Vehicle.vts.h",
"android/hardware/vehicle/2.0/VehicleCallback.vts.h",
],
}
cc_library_shared {
name: "android.hardware.vehicle@2.0-vts.profiler",
generated_sources: ["android.hardware.vehicle@2.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.vehicle@2.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.vehicle@2.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
"libhidlbase",
"libhidltransport",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hidl.base@1.0",
"android.hardware.vehicle@2.0",
],
}

4
vehicle/2.0/default/android.hardware.vehicle@2.0-service.rc
View File

@@ -1,4 +0,0 @@
service vehicle-hal-2.0 /system/bin/hw/android.hardware.vehicle@2.0-service
class hal
user vehicle_network
group system