diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 20:59:10 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 20:59:10 +0000 |
| commit | 71af6f7050eae5391762516aaa292c793c311a1f (patch) | |
| tree | 2732078b95a314e9820e633597679d39638d15a8 | |
| parent | 2e75c66e216aaab595505ebce93513d23bf654ea (diff) | |
| parent | c8f68dbd28331ea33644e710cf6358080535236e (diff) | |
| download | car-simpleperf-release.tar.gz | |
Snap for 11510257 from c8f68dbd28331ea33644e710cf6358080535236e to simpleperf-releasesimpleperf-release
Change-Id: I2e7c82c059c622529969994a699a3f38a30a19b7
| -rw-r--r-- | emulator/car_emulator_product.mk | 3 | ||||
| -rw-r--r-- | emulator/usbpt/usbip-service/Android.bp | 5 | ||||
| -rw-r--r-- | emulator/vhal_aidl/VehicleEmulator/test/Android.bp | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/emulator/car_emulator_product.mk b/emulator/car_emulator_product.mk index 0f1c94a..4e1979d 100644 --- a/emulator/car_emulator_product.mk +++ b/emulator/car_emulator_product.mk @@ -23,6 +23,9 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/generic/car/common/preinstalled-packages-product-car-emulator.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-car-emulator.xml +# This file is used by qemu to provide supported VHAL property list. +PRODUCT_COPY_FILES += hardware/interfaces/automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json:android.hardware.automotive.vehicle-types-meta.json + # TODO(b/253459812): find a better way to handle it. DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \ device/generic/car/common/device_framework_matrix_product.xml diff --git a/emulator/usbpt/usbip-service/Android.bp b/emulator/usbpt/usbip-service/Android.bp index 9ad8446..265e5ba 100644 --- a/emulator/usbpt/usbip-service/Android.bp +++ b/emulator/usbpt/usbip-service/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_pixel_system_sw_security", default_applicable_licenses: ["external_usbip-service_license"], } @@ -32,7 +33,7 @@ cc_binary { init_rc: ["usbip-service.rc"], defaults: ["usbip_defaults"], srcs: [ - "UsbIpService.cpp" + "UsbIpService.cpp", ], static_libs: [ "usbip_utils", @@ -43,7 +44,7 @@ cc_library { name: "usbip_utils", defaults: ["usbip_defaults"], srcs: [ - "UsbIpUtils.cpp" + "UsbIpUtils.cpp", ], export_include_dirs: ["./"], } diff --git a/emulator/vhal_aidl/VehicleEmulator/test/Android.bp b/emulator/vhal_aidl/VehicleEmulator/test/Android.bp index 700ee42..025a368 100644 --- a/emulator/vhal_aidl/VehicleEmulator/test/Android.bp +++ b/emulator/vhal_aidl/VehicleEmulator/test/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_aaos_framework", default_applicable_licenses: ["device_generic_car_license"], } |