RM6785-common: Regen vendor

RM6785-common-vendor.mk

@@ -487,7 +487,6 @@ PRODUCT_COPY_FILES += \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_OP18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP18.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_OP20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP20.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
-    vendor/realme/RM6785-common/proprietary/vendor/etc/factory.ini:$(TARGET_COPY_OUT_VENDOR)/etc/factory.ini \
     vendor/realme/RM6785-common/proprietary/vendor/etc/file112.wav:$(TARGET_COPY_OUT_VENDOR)/etc/file112.wav \
     vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/agps_profiles_conf2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/agps_profiles_conf2.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_Mexico.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_Mexico.xml \
@@ -810,8 +809,11 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.mms@1.5-impl \
     vendor.mediatek.hardware.nvram@1.1-impl \
     vendor.mediatek.hardware.pq@2.6-impl \
+    libJpgEncPipe \
     libOpenCL \
     libTEECommon \
+    libaal_mtk \
+    libaalservice \
     libaedv \
     libbwc \
     libcapctrl \
@@ -838,6 +840,8 @@ PRODUCT_PACKAGES += \
     libion_mtk \
     libion_ulit \
     libipsec_ims_shr \
+    libjpeg-alpha-oal_vendor \
+    libjpeg-alpha_vendor \
     libladder \
     libmtcloader \
     libmtk_drvb \
@@ -866,6 +870,7 @@ PRODUCT_PACKAGES += \
     libverno \
     libvpu \
     libwo \
+    vendor.mediatek.hardware.audio@6.1 \
     vendor.mediatek.hardware.bluetooth.audio@2.1 \
     vendor.mediatek.hardware.gpu@1.0 \
     vendor.mediatek.hardware.keyinstall@1.0 \
@@ -971,7 +976,6 @@ PRODUCT_PACKAGES += \
     libvt_custom \
     libwvhidl \
     libwvdrmengine \
-    vendor.mediatek.hardware.audio@6.1 \
     vendor.mediatek.hardware.mtkcodecservice@1.1 \
     APUWareUtilsServer \
     APUWareXrpServer \
@@ -1369,7 +1373,6 @@ PRODUCT_PACKAGES += \
     libCamera_sarterqtechmains5kgm1sp_portrait_preview_full \
     libFaceBeautyCap \
     libFaceBeautyPre \
-    libJpgEncPipe \
     libMcClient \
     libPerfectlyClearCrux \
     libPolarrRender \
@@ -1388,8 +1391,6 @@ PRODUCT_PACKAGES += \
     lib_bsscore \
     libaal_cust \
     libaal_key \
-    libaal_mtk \
-    libaalservice \
     libakm \
     libapusys \
     libarcsoft_distortion_correction \
@@ -1481,8 +1482,6 @@ PRODUCT_PACKAGES += \
     libimageio \
     libimageio_plat_drv \
     libimageio_plat_pipe \
-    libjpeg-alpha-oal_vendor \
-    libjpeg-alpha_vendor \
     libkmsetkey \
     libksensor \
     liblpcnr \
@@ -1630,7 +1629,7 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.power@1.1 \
     vendor.mediatek.hardware.power@2.0 \
     vendor.mediatek.hardware.pplagent@1.0 \
-    vendor.mediatek.hardware.videotelephony@1.0 \
+    vendor.mediatek.hardware.videotelephony@1.0_vendor \
     vendor.trustonic.tee.tui@1.0 \
     vendor.trustonic.tee@1.0 \
     vendor.trustonic.tee@1.1 \
@@ -1649,13 +1648,13 @@ PRODUCT_PACKAGES += \
     libvcodec_capenc \
     libvt_avsync \
     vendor.mediatek.hardware.videotelephony-V1-ndk \
-    vendor.mediatek.hardware.videotelephony@1.0.system_ext \
+    vendor.mediatek.hardware.videotelephony@1.0 \
     liboemcrypto \
     libormshalclient \
     libpnscr2 \
     sensors.virtual \
     vendor.oplus.hardware.appradio@1.0 \
-    vendor.oplus.hardware.biometrics.fingerprint@2.1.odm \
+    vendor.oplus.hardware.biometrics.fingerprint@2.1_odm \
     vendor.oplus.hardware.biometrics.fingerprintservice@1.0 \
     vendor.oplus.hardware.commondcs@1.0 \
     vendor.oplus.hardware.orms@1.0 \
@@ -1673,13 +1672,13 @@ PRODUCT_PACKAGES += \
     mediatek-telephony-base \
     mediatek-telephony-common \
     com.android.hotwordenrollment.common.util \
-    android.hardware.gpu@1.0-service \
-    android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu \
-    manifest \
-    manifest_android.hardware.drm@1.3-service.widevine \
-    oplus_appradio_device_manifest \
-    oplus_radio_device_manifest \
-    vendor.mediatek.hardware.dplanner@2.0-service \
+    android.hardware.gpu@1.0-service.xml \
+    android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml \
+    manifest.xml \
+    manifest_android.hardware.drm@1.3-service.widevine.xml \
+    oplus_appradio_device_manifest.xml \
+    oplus_radio_device_manifest.xml \
+    vendor.mediatek.hardware.dplanner@2.0-service.xml \
     atcid \
     audiocmdservice_atci \
     autobt \
@@ -1695,7 +1694,6 @@ PRODUCT_PACKAGES += \
     dtc_vendor \
     em_hidl \
     epdg_wod \
-    factory \
     fuelgauged \
     fuelgauged_nvram \
     gsm0710muxd \

proprietary/vendor/etc/factory.ini

@@ -1,185 +0,0 @@
-// test item and test flow configuration
-MenuItem=按键(M);
-MenuItem=指纹测试(A);
-MenuItem=轨迹球(M);
-MenuItem=光学手指导航键(M);
-MenuItem=触摸屏(M);
-MenuItem=LCM测试;
-MenuItem=背光等级(M);
-MenuItem=Storage(A);
-MenuItem=显示屏(M);
-MenuItem=NAND闪存(A);
-MenuItem=存储卡(A);
-MenuItem=SIM卡探测(A);
-MenuItem=信号测试(M);
-MenuItem=振动器(M);
-MenuItem=LED灯(M);
-MenuItem=实时时钟(A);
-MenuItem=回路(A);
-//MenuItem=双麦克风回路(M);
-MenuItem=回路(手机麦克风-扬声器)(A);
-MenuItem=手机麦克扬声器回路(A);
-MenuItem=铃声(A);
-MenuItem=接收器(A);
-MenuItem=Wave回放(M);
-MenuItem=喇叭阻值校正(A);
-MenuItem=扬声器OC测试(M);
-MenuItem=耳机(A);
-MenuItem=加速度传感器(M);
-//MenuItem=加速度传感器校准(M);
-MenuItem=磁力计传感器(M);
-MenuItem=光传感器距离传感器(M);
-MenuItem=陀螺仪传感器(M);
-//MenuItem=陀螺仪传感器校准(M);
-MenuItem=气压传感器(M);
-//MenuItem=湿度传感器(M);
-MenuItem=主照相机(A);
-MenuItem=副照相机(A);
-MenuItem=主照相机2(A);
-MenuItem=主照相机3(A);
-MenuItem=主照相机4(A);
-MenuItem=Main Lens(M);
-MenuItem=Sub Lens(M);
-MenuItem=闪光灯(M);
-MenuItem=GPS定位(A);
-MenuItem=近场通信NFC(M);
-MenuItem=FM收音机(A);
-MenuItem=FM发射器(M);
-MenuItem=蓝牙(A);
-MenuItem=Wi-Fi(A);
-MenuItem=手机电视(A);
-MenuItem=移动电视(A);
-MenuItem=电池和充电(A);
-MenuItem=Slave Charger(M);
-MenuItem=闲置电流(M);
-MenuItem=HDMI(A);
-MenuItem=BTS(A);
-MenuItem=EXT BUCK(M);
-MenuItem=Universal ANT Test(A);
-MenuItem=RF Test(A);
-MenuItem=C2K RF Test(A);
-MenuItem=OTG(A);
-MenuItem=USBTYPEC(A);
-MenuItem=IrTx LED 测试;
-MenuItem=EFUSE(A);
-
-//FM Radio
-FMRadio.CH1=885;
-FMRadio.CH2=1058;
-FMRadio.CH3=980;
-FMRadio.CH4=1080;
-FMRadio.RSSITH=-95;
-
-//FM Transmitter
-FMTX.CH1=878;
-FMTX.CH2=886;
-FMTX.CH3=891;
-FMTX.CH4=910;
-FMTX.CH5=920;
-FMTX.CH6=930;
-FMTX.CH7=940;
-FMTX.CH8=990;
-FMTX.CH9=1050;
-FMTX.CH10=1070;
-
-//WIFI
-WIFI.SSID=mtkguest;
-
-//Vibrator
-Vibrator_Last_Time=0;
-//AUDIO
-Audio.Ringtone=5;
-Audio.Receiver=0;
-Freq.Ringtone=1000;
-Audio.Record.Dump=0;
-Audio.Mic.Sets=1,2,3;
-
-Loopback.Speaker.chToCheck=ALL;
-Lower.Magnitude.Speaker.L=1000000,1000000,500000,500000;
-Upper.Magnitude.Speaker.L=1000000000,1000000000,1000000000,1000000000;
-Lower.Magnitude.Speaker.R=1000000,1000000,500000,500000;
-Upper.Magnitude.Speaker.R=1000000000,1000000000,1000000000,1000000000;
-
-Loopback.Receiver.chToCheck=R;
-Lower.Magnitude.Receiver.L=100;
-Upper.Magnitude.Receiver.L=1000000000;
-Lower.Magnitude.Receiver.R=1000;
-Upper.Magnitude.Receiver.R=1000000000;
-
-Lower.Magnitude.Headset=1000;
-Upper.Magnitude.Headset=1000000000;
-
-//RF Test
-RF.band=28
-RF.dl.earfcn=9435
-RF.rssi0.dbm=-97
-RF.rssi1.dbm=-97
-
-GSM.RF.test=0;
-GSM.RF.arfcn=37;
-GSM.RF.gain=7;
-GSM.RF.band=8;
-GSM.RF.pattern=1;
-GSM.RF.rssi0.dbm=-90;
-
-WCDMA.RF.test=1;
-WCDMA.RF.uarfcn=4458;
-WCDMA.RF.rssi0.dbm=-70;
-WCDMA.RF.rssi1.dbm=-70;
-
-LTE.RF.test=1;
-LTE.RF.band=40;
-LTE.RF.dl.earfcn=39150;
-LTE.RF.rssi0.dbm=-55;
-LTE.RF.rssi1.dbm=-55;
-
-TDSCDMA.RF.test=0;
-TDSCDMA.RF.uarfcn=9500;
-TDSCDMA.RF.rssi0.dbm=-90;
-
-C2K.RF.test=0;
-C2K.RF.subsystem=0;
-C2K.RF.band=0;
-C2K.RF.channel=384;
-C2K.RF.rssi0.dbm=-90;
-C2K.RF.rssi1.dbm=-90;
-
-
-//AudioWavePlayFile
-/res/sound/testpattern1.wav
-
-//AudioRingtonePlayFile
-/res/sound/ringtone.wav
-
-//AudioReceiverFreq2K
-/res/sound/sinewave2k.wav
-
-//AudioReceiverFreq25K
-/res/sound/sinewave25k.wav
-
-//AudioReceiverFreq3K
-/res/sound/sinewave3k.wav
-
-//AudioReceiverFreq35K
-/res/sound/sinewave35k.wav
-
-//AudioReceiverFreq4K
-/res/sound/sinewave4k.wav
-
-//AudioSpeakerFreq05K
-/res/sound/sinewave05k.wav
-
-//AudioSpeakerFreq075K
-/res/sound/sinewave075k.wav
-
-//AudioSpeakerFreq1K
-/res/sound/sinewave1k.wav
-
-//AudioSpeakerFreq15K
-/res/sound/sinewave15k.wav
-
-//AudioSpeakerFreq2K
-/res/sound/sinewave2k.wav
-
-//SpeakerCalibrationPlayFile
-/res/sound/CalibrationPatternOut.wav