Merge "shamp: enable only for board with modem" into main
This commit is contained in:
Xiaofan Jiang
Android (Google) Code Review
commit
1945fa5341
1 changed files with 74 additions and 76 deletions
148
device.mk
148
device.mk
|
|
@ -218,12 +218,84 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
persist.sys.hdcp_checking=always
|
||||
|
||||
USE_LASSEN_OEMHOOK := true
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
|
||||
# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
|
||||
|
||||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
||||
|
||||
# modem_ml_svc_sit daemon
|
||||
PRODUCT_PACKAGES += modem_ml_svc_sit
|
||||
|
||||
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||
# Modem ML TFLite service.
|
||||
PRODUCT_PACKAGES += modemml-tflite-service \
|
||||
libtensorflowlite_jni
|
||||
|
||||
# Allow TFLite service modules to be installed to the system partition
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
|
||||
system/etc/vintf/manifest/modemml_tflite_service.xml \
|
||||
system/framework/modemml-tflite-service.jar \
|
||||
system/framework/oat/arm64/modemml-tflite-service.odex \
|
||||
system/framework/oat/arm64/modemml-tflite-service.vdex \
|
||||
system/lib64/libtensorflowlite_jni.so
|
||||
|
||||
PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
|
||||
endif
|
||||
|
||||
# modem ML models configs
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \
|
||||
device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/zumapro/modem_ml/modem_ml_nnapi_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \
|
||||
device/google/zumapro/modem_ml/modem_ml_tflite_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf
|
||||
endif
|
||||
|
||||
# modem logging binary/configs
|
||||
PRODUCT_PACKAGES += modem_logging_control
|
||||
|
||||
# libeomservice_proxy binary/configs
|
||||
PRODUCT_PACKAGES += liboemservice_proxy_default
|
||||
|
||||
# modem logging configs
|
||||
PRODUCT_PACKAGES += \
|
||||
logging.conf \
|
||||
default.cfg \
|
||||
default.nprf \
|
||||
default_metrics.xml \
|
||||
Pixel_stability.cfg \
|
||||
Pixel_stability.nprf \
|
||||
extensive_logging.conf
|
||||
|
||||
# Vendor modem extensive logging default property
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.modem.extensive_logging_enabled=false
|
||||
|
||||
# Pixel Logger
|
||||
include hardware/google/pixel/PixelLogger/PixelLogger.mk
|
||||
|
||||
# RIL extension service
|
||||
ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
|
||||
include device/google/gs-common/pixel_ril/ril.mk
|
||||
endif
|
||||
|
||||
# Use Lassen specifc Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
|
||||
else # ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
|
||||
# Pixel Logger
|
||||
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app
|
||||
|
||||
endif # ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
|
||||
# Shared Modem Platform
|
||||
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
|
||||
|
||||
# Use for GRIL
|
||||
USES_LASSEN_MODEM := true
|
||||
USE_WHI_GRIL_RECOVERY := true
|
||||
|
|
@ -957,10 +1029,6 @@ USE_EARLY_SEND_DEVICE_INFO := true
|
|||
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
||||
#$(call inherit-product, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
|
||||
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
||||
endif
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||
#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
|
||||
#$(call inherit-product-if-exists, hardware/google_devices/zumapro/zumapro.mk)
|
||||
|
|
@ -975,58 +1043,6 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/zumapro/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 \
|
||||
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# modem_ml_svc_sit daemon
|
||||
PRODUCT_PACKAGES += modem_ml_svc_sit
|
||||
|
||||
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||
# Modem ML TFLite service.
|
||||
PRODUCT_PACKAGES += modemml-tflite-service \
|
||||
libtensorflowlite_jni
|
||||
|
||||
# Allow TFLite service modules to be installed to the system partition
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
|
||||
system/etc/vintf/manifest/modemml_tflite_service.xml \
|
||||
system/framework/modemml-tflite-service.jar \
|
||||
system/framework/oat/arm64/modemml-tflite-service.odex \
|
||||
system/framework/oat/arm64/modemml-tflite-service.vdex \
|
||||
system/lib64/libtensorflowlite_jni.so
|
||||
|
||||
PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
|
||||
endif
|
||||
|
||||
# modem ML models configs
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \
|
||||
device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/zumapro/modem_ml/modem_ml_nnapi_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \
|
||||
device/google/zumapro/modem_ml/modem_ml_tflite_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf
|
||||
endif
|
||||
|
||||
# modem logging binary/configs
|
||||
PRODUCT_PACKAGES += modem_logging_control
|
||||
|
||||
# libeomservice_proxy binary/configs
|
||||
PRODUCT_PACKAGES += liboemservice_proxy_default
|
||||
|
||||
# modem logging configs
|
||||
PRODUCT_PACKAGES += \
|
||||
logging.conf \
|
||||
default.cfg \
|
||||
default.nprf \
|
||||
default_metrics.xml \
|
||||
Pixel_stability.cfg \
|
||||
Pixel_stability.nprf \
|
||||
extensive_logging.conf
|
||||
|
||||
# Vendor modem extensive logging default property
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.modem.extensive_logging_enabled=false
|
||||
endif
|
||||
|
||||
# Vibrator Diag
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
diag-vibrator \
|
||||
|
|
@ -1164,13 +1180,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
# Project
|
||||
include hardware/google/pixel/common/pixel-common-device.mk
|
||||
|
||||
# Pixel Logger
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
include hardware/google/pixel/PixelLogger/PixelLogger.mk
|
||||
else
|
||||
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app
|
||||
endif
|
||||
|
||||
# RadioExt Version
|
||||
USES_RADIOEXT_V1_7 = true
|
||||
|
||||
|
|
@ -1203,13 +1212,6 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
|
|||
# UFS: the script is used to select the corresponding firmware to run FFU.
|
||||
PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh
|
||||
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# RIL extension service
|
||||
ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
|
||||
include device/google/gs-common/pixel_ril/ril.mk
|
||||
endif
|
||||
endif
|
||||
|
||||
SUPPORT_VENDOR_SATELLITE_SERVICE := true
|
||||
|
||||
# Telephony satellite geofence data file
|
||||
|
|
@ -1234,7 +1236,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
# since it can't be overridden from /vendor.
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
dumpstate.strict_run=false
|
||||
|
||||
# Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue