Improvements for BOARD_WITHOUT_RADIO.

As far as I can tell, GPS is part of the radio board on Zuma, so disabling
the radio should disable GPS as well.

The PixelLogger app has a hard dependency on the shannondm logger,
so don't install it if the radio is disabled.

This will help avoid service restarts so that we will be able
to do more accurate perf measurements.

Bug: 237601345
Change-Id: I60639d8e8fb61343ba19c2d9bea40cbeb8c6e0fd
This commit is contained in:
Peter Collingbourne 2022-11-04 14:47:23 -07:00
parent 3586b36d91
commit 5e5f5ffd2c

View file

@ -22,7 +22,9 @@ include device/google/gs-common/modem/modem.mk
include device/google/gs-common/aoc/aoc.mk include device/google/gs-common/aoc/aoc.mk
include device/google/gs-common/trusty/trusty.mk include device/google/gs-common/trusty/trusty.mk
include device/google/gs-common/storage/storage.mk include device/google/gs-common/storage/storage.mk
ifneq ($(BOARD_WITHOUT_RADIO),true)
include device/google/gs-common/gps/brcm/device.mk include device/google/gs-common/gps/brcm/device.mk
endif
TARGET_BOARD_PLATFORM := zuma TARGET_BOARD_PLATFORM := zuma
ALLOW_MISSING_DEPENDENCIES := true ALLOW_MISSING_DEPENDENCIES := true
@ -890,7 +892,9 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
endif endif
#GPS conf #GPS conf
ifneq ($(BOARD_WITHOUT_RADIO),true)
include device/google/zuma/gnss/device-gnss.mk include device/google/zuma/gnss/device-gnss.mk
endif
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
@ -906,6 +910,7 @@ PRODUCT_COPY_FILES += \
device/google/zuma/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ device/google/zuma/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
ifneq ($(BOARD_WITHOUT_RADIO),true)
# modem_svc_sit daemon # modem_svc_sit daemon
PRODUCT_PACKAGES += modem_svc_sit PRODUCT_PACKAGES += modem_svc_sit
@ -918,6 +923,7 @@ PRODUCT_COPY_FILES += \
device/google/zuma/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ device/google/zuma/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \
device/google/zuma/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ device/google/zuma/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \
device/google/zuma/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml device/google/zuma/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml
endif
# ARM NN files # ARM NN files
ARM_COMPUTE_CL_ENABLE := 1 ARM_COMPUTE_CL_ENABLE := 1
@ -1087,7 +1093,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
include hardware/google/pixel/common/pixel-common-device.mk include hardware/google/pixel/common/pixel-common-device.mk
# Pixel Logger # Pixel Logger
ifneq ($(BOARD_WITHOUT_RADIO),true)
include hardware/google/pixel/PixelLogger/PixelLogger.mk include hardware/google/pixel/PixelLogger/PixelLogger.mk
else
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app
endif
# sscoredump # sscoredump
include hardware/google/pixel/sscoredump/device.mk include hardware/google/pixel/sscoredump/device.mk