From 6519a1598bd25f9b5e2b9f9900986fe96cee65aa Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Sat, 17 Feb 2024 12:33:52 +0800 Subject: [PATCH 1/4] gps: maintain one solution Bug: 315915958 Test: build pass and GPS function works Change-Id: I873fca68597188ccca7cd83e6665da5f047068aa Merged-In: I873fca68597188ccca7cd83e6665da5f047068aa --- conf/init.zumapro.board.rc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 2279e47..741f011 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -300,26 +300,6 @@ on post-fs-data # Video data mkdir /data/vendor/media 0700 mediacodec mediacodec -on post-fs-data - # GPS - mkdir /data/vendor/gps 0771 system system - chown system system /data/vendor/gps - rm /data/vendor/gps/gps_started - rm /data/vendor/gps/glonass_started - rm /data/vendor/gps/beidou_started - rm /data/vendor/gps/smd_started - rm /data/vendor/gps/sv_cno.info - - chown gps system /sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - chmod 0664 /dev/ttyBCM - chown gps system /dev/ttyBCM - chmod 0664 /dev/bbd_control - chown gps system /dev/bbd_control - chmod 0664 /dev/bbd_patch - chown gps system /dev/bbd_patch - chmod 0664 /dev/bbd_sensor - chown gps system /dev/bbd_sensor - on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 From 5e28bfad5ef3e2f5476e892cc876e8eebf5ca612 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Fri, 7 Jun 2024 01:30:08 +0000 Subject: [PATCH 2/4] Add modemml-tflite-service to system_ext Bug: 343367700 Test: Build pass Change-Id: I2dc03a4f253a53db536a38041bc2714960577b41 --- device.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/device.mk b/device.mk index 3b5cd54..f71f038 100644 --- a/device.mk +++ b/device.mk @@ -233,15 +233,7 @@ ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) 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 +PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service endif # modem ML models configs From 77e5ba0426d9ba7b8daadae2aa2898207b49b172 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 11 Jun 2024 03:19:55 +0000 Subject: [PATCH 3/4] Revert "Add modemml-tflite-service to system_ext" Revert submission 27728915-modemml-tflite-system-ext Reason for revert: Build breakage at ab/11950917 Reverted changes: /q/submissionid:27728915-modemml-tflite-system-ext Change-Id: I4b6318df2c29c3cd71e4925a50328c5e3902f543 --- device.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f71f038..3b5cd54 100644 --- a/device.mk +++ b/device.mk @@ -233,7 +233,15 @@ ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES += modemml-tflite-service \ libtensorflowlite_jni -PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service +# 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 From 3f2b22c54c99a904452bcb7d97bf9f42ca9a9c1f Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 11 Jun 2024 15:32:53 +0800 Subject: [PATCH 4/4] wifi: Move WIFI_BRCM_OPEN_SOURCE_MULTI_AKM to project-specific folder Since not all projects on this platform support open source multiple akm, move WIFI_BRCM_OPEN_SOURCE_MULTI_AKM to project-specific folder. Bug: 345118973 Test: Build Pass Change-Id: I80cf83e06eb1199dd4a9b702a9dec7f2af0463ec --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index 1fdf915..daad46c 100644 --- a/device.mk +++ b/device.mk @@ -852,8 +852,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled - ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += wpa_cli PRODUCT_PACKAGES += hostapd_cli