diff options
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/aosp_car_emulator.mk | 3 | ||||
-rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp | 7 | ||||
-rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay_OsDouble/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | emulator/usbpt/bluetooth/btusb/btusb.mk | 4 | ||||
-rw-r--r-- | emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp | 24 | ||||
-rwxr-xr-x | emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin | bin | 10 -> 0 bytes | |||
-rw-r--r-- | emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin | bin | 48816 -> 0 bytes | |||
-rw-r--r-- | emulator/usbpt/protocan/canbus_config.pb | 11 | ||||
-rw-r--r-- | emulator/usbpt/protocan/manifest.protocan.xml | 2 |
10 files changed, 12 insertions, 43 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk index e727007..f0810a9 100644 --- a/emulator/aosp_car_emulator.mk +++ b/emulator/aosp_car_emulator.mk @@ -38,12 +38,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ ifeq (true,$(ENABLE_CLUSTER_OS_DOUBLE)) PRODUCT_PACKAGES += CarServiceOverlayEmulatorOsDouble -GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayEmulatorOsDoubleGoogle else PRODUCT_PACKAGES += CarServiceOverlayEmulator -GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayEmulatorGoogle endif # ENABLE_CLUSTER_OS_DOUBLE endif # BUILD_EMULATOR_CLUSTER_DISPLAY PRODUCT_PRODUCT_PROPERTIES += \ ro.carwatchdog.vhal_healthcheck.interval=10 \ + ro.carwatchdog.client_healthcheck.interval=20 \ diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp b/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp index e4a1425..22fc331 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp +++ b/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp @@ -25,10 +25,3 @@ runtime_resource_overlay { sdk_version: "current", product_specific: true } - -override_runtime_resource_overlay { - name: "CarServiceOverlayEmulatorGoogle", - base: "CarServiceOverlayEmulator", - package_name: "com.google.android.car.resources.emulator", - target_package_name: "com.google.android.car.updatable", -} diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay/AndroidManifest.xml b/emulator/cluster/rro_overlays/CarServiceOverlay/AndroidManifest.xml index ce23b9c..332c34d 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay/AndroidManifest.xml +++ b/emulator/cluster/rro_overlays/CarServiceOverlay/AndroidManifest.xml @@ -17,7 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.car.resources.emulator"> <application android:hasCode="false"/> - <overlay android:priority="0" + <overlay android:priority="5001" android:targetPackage="com.android.car.updatable" android:targetName="CarServiceCustomization" android:resourcesMap="@xml/overlays" diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay_OsDouble/AndroidManifest.xml b/emulator/cluster/rro_overlays/CarServiceOverlay_OsDouble/AndroidManifest.xml index c1b801a..dda9cff 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay_OsDouble/AndroidManifest.xml +++ b/emulator/cluster/rro_overlays/CarServiceOverlay_OsDouble/AndroidManifest.xml @@ -17,7 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.car.resources.emulator.osdouble"> <application android:hasCode="false"/> - <overlay android:priority="0" + <overlay android:priority="5001" android:targetPackage="com.android.car.updatable" android:targetName="CarServiceCustomization" android:resourcesMap="@xml/overlays" diff --git a/emulator/usbpt/bluetooth/btusb/btusb.mk b/emulator/usbpt/bluetooth/btusb/btusb.mk index 6e21465..d2c52c2 100644 --- a/emulator/usbpt/bluetooth/btusb/btusb.mk +++ b/emulator/usbpt/bluetooth/btusb/btusb.mk @@ -19,9 +19,5 @@ BOARD_SEPOLICY_DIRS += \ device/generic/car/emulator/usbpt/bluetooth/btusb/sepolicy endif -# USB Passthru -PRODUCT_PACKAGES += rtl8821c_fw.bin.car \ - rtl8821c_config.bin.car - PRODUCT_COPY_FILES += \ device/generic/car/emulator/usbpt/bluetooth/btusb/init.btusb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.btusb.rc \ diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp b/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp deleted file mode 100644 index ade064e..0000000 --- a/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp +++ /dev/null @@ -1,24 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "device_generic_car_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["device_generic_car_license"], -} - -prebuilt_firmware { - name: "rtl8821c_fw.bin.car", - src: "rtl8821c_fw.bin", - sub_dir: "rtl_bt", - filename_from_src: true, - proprietary: true, -} - -prebuilt_firmware { - name: "rtl8821c_config.bin.car", - src: "rtl8821c_config.bin", - sub_dir: "rtl_bt", - filename_from_src: true, - proprietary: true, -} diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin b/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin Binary files differdeleted file mode 100755 index 76f62b8..0000000 --- a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin +++ /dev/null diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin b/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin Binary files differdeleted file mode 100644 index ad31c94..0000000 --- a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin +++ /dev/null diff --git a/emulator/usbpt/protocan/canbus_config.pb b/emulator/usbpt/protocan/canbus_config.pb index 333d081..2e3599d 100644 --- a/emulator/usbpt/protocan/canbus_config.pb +++ b/emulator/usbpt/protocan/canbus_config.pb @@ -12,12 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. buses: [ - { + { name: "BCAN" virtual { ifname: "vcan0" } bitrate: 125000 - }, - { + }, + { + name: "CCAN" + virtual { ifname: "vcan0" } + bitrate: 250000 + }, + { name: "aae" native { ifname: "can0" } bitrate: 250000 diff --git a/emulator/usbpt/protocan/manifest.protocan.xml b/emulator/usbpt/protocan/manifest.protocan.xml index 6281907..f23cbf9 100644 --- a/emulator/usbpt/protocan/manifest.protocan.xml +++ b/emulator/usbpt/protocan/manifest.protocan.xml @@ -1,4 +1,4 @@ -<manifest version="1.0" type="device" target-level="3"> +<manifest version="1.0" type="device"> <hal format="hidl"> <name>android.hardware.automotive.can</name> <transport>hwbinder</transport> |