diff options
-rw-r--r-- | emulator/car_emulator_vendor.mk | 4 | ||||
-rw-r--r-- | emulator/usbpt/usbip-service/Android.bp | 5 | ||||
-rw-r--r-- | emulator/vhal_aidl/VehicleEmulator/test/Android.bp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/emulator/car_emulator_vendor.mk b/emulator/car_emulator_vendor.mk index 64033f5..8a4b0fb 100644 --- a/emulator/car_emulator_vendor.mk +++ b/emulator/car_emulator_vendor.mk @@ -142,7 +142,7 @@ endif # BUILD_EMULATOR_CLUSTER_DISPLAY endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG # Should use car bluetooth.prop. -# This replaces value from device/generic/goldfish/64bitonly/product/vendor.mk below +# This replaces value from device/generic/goldfish/product/generic.mk below ifeq (,$(ENABLE_CAR_USB_PASSTHROUGH)) ENABLE_CAR_USB_PASSTHROUGH := false endif @@ -151,7 +151,7 @@ TARGET_PRODUCT_PROP := device/generic/car/emulator/usbpt/bluetooth/bluetooth.pro endif # Goldfish vendor partition configurations -$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk) +$(call inherit-product, device/generic/goldfish/product/generic.mk) # Enable socket for qemu VHAL BOARD_SEPOLICY_DIRS += device/generic/car/emulator/sepolicy 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"], } |