Merge cherrypicks of ['googleplex-android-review.googlesource.com/28141935'] into 24Q3-release.

Change-Id: I24b06599737be51cd3eb8f6f6db1f1a9b34e5347
This commit is contained in:
Android Build Coastguard Worker 2024-07-03 04:26:51 +00:00
commit 8ec17f766a
2 changed files with 13 additions and 15 deletions

View file

@ -228,21 +228,18 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
# 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
# TODO: b/350624523 - Add back modem ML TFLite service after it is ready.
# 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
# # Allow TFLite service modules to be installed to the system partition
# PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
# system/lib64/libtensorflowlite_jni.so
PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
endif
# PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service
# endif
# modem ML models configs
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

View file

@ -304,9 +304,10 @@
<!-- Class names of device-specific services inheriting com.android.server.SystemService. The
classes are instantiated in the order of the array. -->
<string-array translatable="false" name="config_deviceSpecificSystemServices">
<!-- TODO: b/350624523 - Add back modem ML TFLite service after it is ready. -->
<!-- <string-array translatable="false" name="config_deviceSpecificSystemServices">
<item>com.android.server.modemml.TFLiteService</item>
</string-array>
</string-array> -->
<!-- Pre-scale volume at volume step 1 for Absolute Volume -->
<fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>