From cd7dbc5a41f2ae582da6e3265b84ccbafea93180 Mon Sep 17 00:00:00 2001 From: yuanruibin Date: Tue, 6 May 2025 14:50:22 +0800 Subject: [PATCH 1/3] sync cme libs --- aosp/vendor/common/android/scripts/init.sh | 2 -- aosp/vendor/common/products/product_prebuilts.mk | 7 ------- 2 files changed, 9 deletions(-) diff --git a/aosp/vendor/common/android/scripts/init.sh b/aosp/vendor/common/android/scripts/init.sh index 90a7f3c9e..e249fc796 100755 --- a/aosp/vendor/common/android/scripts/init.sh +++ b/aosp/vendor/common/android/scripts/init.sh @@ -1,7 +1,5 @@ #! /system/bin/sh -[[ -f /system/bin/sipcserver ]] && nohup /system/bin/sipcserver > /dev/null & - #engine of netInt hard_encode for real_enc_index in `seq 0 3`;do if [[ -f "/dev/nvme${real_enc_index}" && -f "/dev/nvme${real_enc_index}n1" ]]; then diff --git a/aosp/vendor/common/products/product_prebuilts.mk b/aosp/vendor/common/products/product_prebuilts.mk index 02119504e..b6b714b1e 100644 --- a/aosp/vendor/common/products/product_prebuilts.mk +++ b/aosp/vendor/common/products/product_prebuilts.mk @@ -4,16 +4,12 @@ # PRODUCT_PACKAGES += \ - libVmiStream \ libCPHMediaEngine \ libCPHVideoEngine \ libCPHTurboVideoEngine \ libCPHMediaServer \ libCaptureEngine \ libVmiOperation \ - libCPHIVmiAudio \ - libCPHVmiAudioRecord \ - libvmiservice \ libVmiCJSON \ libVmiMediaCommon \ libEncodeEngine \ @@ -21,15 +17,12 @@ PRODUCT_PACKAGES += \ camera.default \ camera.$(BUILD_HARDWARE).jpeg \ sensors.default \ - sipcserver \ - libSipc \ libavcodec \ libavformat \ libavutil \ libswresample \ libd310encode \ libRemoteEncoder \ - libVmiShareMem \ libevent \ libLLVM13 \ libGLES_mesa \ -- Gitee From 163452a4487940ccc929bcf1d20416d161035bfa Mon Sep 17 00:00:00 2001 From: Hinix Date: Mon, 26 May 2025 11:58:36 +0000 Subject: [PATCH 2/3] Revert "sync cme libs" This reverts commit cd7dbc5a41f2ae582da6e3265b84ccbafea93180. --- aosp/vendor/common/android/scripts/init.sh | 2 ++ aosp/vendor/common/products/product_prebuilts.mk | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/aosp/vendor/common/android/scripts/init.sh b/aosp/vendor/common/android/scripts/init.sh index e249fc796..90a7f3c9e 100755 --- a/aosp/vendor/common/android/scripts/init.sh +++ b/aosp/vendor/common/android/scripts/init.sh @@ -1,5 +1,7 @@ #! /system/bin/sh +[[ -f /system/bin/sipcserver ]] && nohup /system/bin/sipcserver > /dev/null & + #engine of netInt hard_encode for real_enc_index in `seq 0 3`;do if [[ -f "/dev/nvme${real_enc_index}" && -f "/dev/nvme${real_enc_index}n1" ]]; then diff --git a/aosp/vendor/common/products/product_prebuilts.mk b/aosp/vendor/common/products/product_prebuilts.mk index b6b714b1e..02119504e 100644 --- a/aosp/vendor/common/products/product_prebuilts.mk +++ b/aosp/vendor/common/products/product_prebuilts.mk @@ -4,12 +4,16 @@ # PRODUCT_PACKAGES += \ + libVmiStream \ libCPHMediaEngine \ libCPHVideoEngine \ libCPHTurboVideoEngine \ libCPHMediaServer \ libCaptureEngine \ libVmiOperation \ + libCPHIVmiAudio \ + libCPHVmiAudioRecord \ + libvmiservice \ libVmiCJSON \ libVmiMediaCommon \ libEncodeEngine \ @@ -17,12 +21,15 @@ PRODUCT_PACKAGES += \ camera.default \ camera.$(BUILD_HARDWARE).jpeg \ sensors.default \ + sipcserver \ + libSipc \ libavcodec \ libavformat \ libavutil \ libswresample \ libd310encode \ libRemoteEncoder \ + libVmiShareMem \ libevent \ libLLVM13 \ libGLES_mesa \ -- Gitee From 794de66444b87a21e94d2a1a8a5ec6fc7c0dd2b4 Mon Sep 17 00:00:00 2001 From: Hinix Date: Thu, 5 Jun 2025 01:58:32 +0000 Subject: [PATCH 3/3] Revert "Revert "sync cme libs"" This reverts commit 163452a4487940ccc929bcf1d20416d161035bfa. --- aosp/vendor/common/android/scripts/init.sh | 2 -- aosp/vendor/common/products/product_prebuilts.mk | 7 ------- 2 files changed, 9 deletions(-) diff --git a/aosp/vendor/common/android/scripts/init.sh b/aosp/vendor/common/android/scripts/init.sh index 90a7f3c9e..e249fc796 100755 --- a/aosp/vendor/common/android/scripts/init.sh +++ b/aosp/vendor/common/android/scripts/init.sh @@ -1,7 +1,5 @@ #! /system/bin/sh -[[ -f /system/bin/sipcserver ]] && nohup /system/bin/sipcserver > /dev/null & - #engine of netInt hard_encode for real_enc_index in `seq 0 3`;do if [[ -f "/dev/nvme${real_enc_index}" && -f "/dev/nvme${real_enc_index}n1" ]]; then diff --git a/aosp/vendor/common/products/product_prebuilts.mk b/aosp/vendor/common/products/product_prebuilts.mk index 02119504e..b6b714b1e 100644 --- a/aosp/vendor/common/products/product_prebuilts.mk +++ b/aosp/vendor/common/products/product_prebuilts.mk @@ -4,16 +4,12 @@ # PRODUCT_PACKAGES += \ - libVmiStream \ libCPHMediaEngine \ libCPHVideoEngine \ libCPHTurboVideoEngine \ libCPHMediaServer \ libCaptureEngine \ libVmiOperation \ - libCPHIVmiAudio \ - libCPHVmiAudioRecord \ - libvmiservice \ libVmiCJSON \ libVmiMediaCommon \ libEncodeEngine \ @@ -21,15 +17,12 @@ PRODUCT_PACKAGES += \ camera.default \ camera.$(BUILD_HARDWARE).jpeg \ sensors.default \ - sipcserver \ - libSipc \ libavcodec \ libavformat \ libavutil \ libswresample \ libd310encode \ libRemoteEncoder \ - libVmiShareMem \ libevent \ libLLVM13 \ libGLES_mesa \ -- Gitee