diff options
| -rw-r--r-- | blueline_car/aosp_blueline_car.mk | 3 | ||||
| -rw-r--r-- | bonito_car/aosp_bonito_car.mk | 3 | ||||
| -rw-r--r-- | bonito_car/device-common.mk | 3 | ||||
| -rw-r--r-- | common/sepolicy/hal_vehicle_default.te | 3 | ||||
| -rw-r--r-- | common/sepolicy/system_server.te | 2 | ||||
| -rw-r--r-- | coral_car/aosp_coral_car.mk | 3 | ||||
| -rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 3 | ||||
| -rw-r--r-- | crosshatch_car/device-common.mk | 6 | ||||
| -rw-r--r-- | flame_car/aosp_flame_car.mk | 4 | ||||
| -rw-r--r-- | sargo_car/aosp_sargo_car.mk | 3 | ||||
| -rw-r--r-- | sargo_car/device-common.mk | 3 |
11 files changed, 29 insertions, 7 deletions
diff --git a/blueline_car/aosp_blueline_car.mk b/blueline_car/aosp_blueline_car.mk index 66851ad..b658b04 100644 --- a/blueline_car/aosp_blueline_car.mk +++ b/blueline_car/aosp_blueline_car.mk @@ -46,6 +46,9 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service diff --git a/bonito_car/aosp_bonito_car.mk b/bonito_car/aosp_bonito_car.mk index 6980607..75bcf8f 100644 --- a/bonito_car/aosp_bonito_car.mk +++ b/bonito_car/aosp_bonito_car.mk @@ -46,6 +46,9 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service diff --git a/bonito_car/device-common.mk b/bonito_car/device-common.mk index 830de03..471fc0b 100644 --- a/bonito_car/device-common.mk +++ b/bonito_car/device-common.mk @@ -27,9 +27,6 @@ PRODUCT_PLATFORM := sdm670 # Enable updating of APEXes $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) -# Enable userspace reboot -$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk) - include device/google/bonito/device-audio-mfg.mk include device/google/bonito/device.mk diff --git a/common/sepolicy/hal_vehicle_default.te b/common/sepolicy/hal_vehicle_default.te new file mode 100644 index 0000000..c0a9698 --- /dev/null +++ b/common/sepolicy/hal_vehicle_default.te @@ -0,0 +1,3 @@ +# Configuration for register VHAL to car watchdog +carwatchdog_client_domain(hal_vehicle_default) +binder_use(hal_vehicle_default) diff --git a/common/sepolicy/system_server.te b/common/sepolicy/system_server.te new file mode 100644 index 0000000..a9ce1b1 --- /dev/null +++ b/common/sepolicy/system_server.te @@ -0,0 +1,2 @@ +# Allow system_server to kill vehicle HAL +allow system_server hal_vehicle_server:process sigkill; diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk index f156a84..1d60b00 100644 --- a/coral_car/aosp_coral_car.mk +++ b/coral_car/aosp_coral_car.mk @@ -46,6 +46,9 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + # Car init.rc PRODUCT_COPY_FILES += \ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc \ diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk index 704a2f1..63f9dd0 100644 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ b/crosshatch_car/aosp_crosshatch_car.mk @@ -46,6 +46,9 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service diff --git a/crosshatch_car/device-common.mk b/crosshatch_car/device-common.mk index 73d5389..da765fb 100644 --- a/crosshatch_car/device-common.mk +++ b/crosshatch_car/device-common.mk @@ -140,9 +140,13 @@ PRODUCT_PACKAGES += \ # # Enable retrofit dynamic partitions for all blueline -# and crosshatch targets +# and crosshatch (except for hwaddress) targets PRODUCT_USE_DYNAMIC_PARTITIONS := true +ifneq (,$(filter hwaddress, $(SANITIZE_TARGET))) +PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := false +else PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := true +endif PRODUCT_PACKAGES += \ android.hardware.boot@1.0-impl.recovery \ bootctrl.sdm845 \ diff --git a/flame_car/aosp_flame_car.mk b/flame_car/aosp_flame_car.mk index 984c03f..cfaaf4e 100644 --- a/flame_car/aosp_flame_car.mk +++ b/flame_car/aosp_flame_car.mk @@ -46,6 +46,10 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service + +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + # Car init.rc PRODUCT_COPY_FILES += \ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc \ diff --git a/sargo_car/aosp_sargo_car.mk b/sargo_car/aosp_sargo_car.mk index b3729aa..d8963de 100644 --- a/sargo_car/aosp_sargo_car.mk +++ b/sargo_car/aosp_sargo_car.mk @@ -46,6 +46,9 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ android.hardware.automotive.vehicle@2.0-service +# Additional selinux policy +BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy + PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service diff --git a/sargo_car/device-common.mk b/sargo_car/device-common.mk index 830de03..471fc0b 100644 --- a/sargo_car/device-common.mk +++ b/sargo_car/device-common.mk @@ -27,9 +27,6 @@ PRODUCT_PLATFORM := sdm670 # Enable updating of APEXes $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) -# Enable userspace reboot -$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk) - include device/google/bonito/device-audio-mfg.mk include device/google/bonito/device.mk |