Merge "Disable modemml-tflite-service" into main

This commit is contained in:
Kah Xuan Lim 2024-07-02 14:11:02 +00:00 committed by Android (Google) Code Review
commit ee3e72ceb6
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 # modem_ml_svc_sit daemon
PRODUCT_PACKAGES += modem_ml_svc_sit PRODUCT_PACKAGES += modem_ml_svc_sit
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) # TODO: b/350624523 - Add back modem ML TFLite service after it is ready.
# Modem ML TFLite service. # ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES += modemml-tflite-service \ # # Modem ML TFLite service.
libtensorflowlite_jni # PRODUCT_PACKAGES += modemml-tflite-service \
# libtensorflowlite_jni
# Allow TFLite service modules to be installed to the system partition # # Allow TFLite service modules to be installed to the system partition
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ # PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/vintf/manifest/modemml_tflite_service.xml \ # system/lib64/libtensorflowlite_jni.so
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 # PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service
endif # endif
# modem ML models configs # modem ML models configs
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) 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 <!-- Class names of device-specific services inheriting com.android.server.SystemService. The
classes are instantiated in the order of the array. --> 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> <item>com.android.server.modemml.TFLiteService</item>
</string-array> </string-array> -->
<!-- Pre-scale volume at volume step 1 for Absolute Volume --> <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
<fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction> <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>