同步：主干dailybuild脚本，主要与海军的脚本进行部分同步。

crontask/dailybuild_rt2841_master.sh

@@ -21,6 +21,19 @@ COPYTMPNAME=$PROJECTNAME"_img"
 KEY_OPTION=$WORKSPACE"/kernel/android/pie/device/tv051/R1/rt2841Releasekeys"
 Temp_file=$WORKSPACE"/temp_file/temp_file_41"
 RTK_TV_NEWMENU=FALSE
+INSTALL_SCAST_APP=true
+INSTALL_E_SHOW_APP=true
+INSTALL_ESTICKER_APP=false
+# 带S表示SCBC的;
+INSTALL_ESTICKER_S_APP=true
+INSTALL_PRIMEVIDEO_APP=false
+# 带S表示SCBC的;
+INSTALL_PRIMEVIDEO_S_APP=true
+# 导入公版蓝牙
+INSTALL_AUDIOCONNECT_APP=true
+# 导入松下蓝牙;
+INSTALL_AUDIOLINK_APP=false
+TARGET_INSTALL_ARTEL_TVAPP=false
 TCL_APPS_SVN_SRC_APK=https://odm-design-center-hz.tclking.com/svn/scbc_apps/trunk/app/apk
 
 # check cur path is android top
@@ -36,9 +49,22 @@ if [ ! -d "$Temp_file" ]; then
 fi
 
 function customize_app() {
-    rm -rf $ANDROID_DIR/vendor/tv051/app/PrimeVideo_Panasonic
-    rm -rf $ANDROID_DIR/vendor/tv051/app/Esticker_songxia
-    rm -rf $ANDROID_DIR/vendor/tv051/app/AudioLink
+    export INSTALL_SCAST_APP=$INSTALL_SCAST_APP
+    export INSTALL_E_SHOW_APP=$INSTALL_E_SHOW_APP
+    export INSTALL_ESTICKER_APP=$INSTALL_ESTICKER_APP
+    export INSTALL_ESTICKER_S_APP=$INSTALL_ESTICKER_S_APP
+    export INSTALL_PRIMEVIDEO_APP=$INSTALL_PRIMEVIDEO_APP
+    export INSTALL_PRIMEVIDEO_S_APP=$INSTALL_PRIMEVIDEO_S_APP
+    export INSTALL_AUDIOCONNECT_APP=$INSTALL_AUDIOCONNECT_APP
+    export INSTALL_AUDIOLINK_APP=$INSTALL_AUDIOLINK_APP
+    echo "INSTALL_SCAST_APP:      " $INSTALL_SCAST_APP
+    echo "INSTALL_E_SHOW_APP:      " $INSTALL_E_SHOW_APP
+    echo "INSTALL_ESTICKER_APP:      " $INSTALL_ESTICKER_APP
+    echo "INSTALL_ESTICKER_S_APP:      " $INSTALL_ESTICKER_S_APP
+    echo "INSTALL_PRIMEVIDEO_APP:      " $INSTALL_PRIMEVIDEO_APP
+    echo "INSTALL_PRIMEVIDEO_S_APP:      " $INSTALL_PRIMEVIDEO_S_APP
+    echo "INSTALL_AUDIOCONNECT_APP:      " $INSTALL_AUDIOCONNECT_APP
+    echo "INSTALL_AUDIOLINK_APP:      " $INSTALL_AUDIOLINK_APP
 }
 
 var_d=$(date '+%m%d%H')
@@ -54,7 +80,9 @@ function pre_build_debug() {
     Checkout_app=y
 
     export TCL_PRODUCT_VERSION=$version
+    export TARGET_INSTALL_ARTEL_TVAPP=$INSTALL_ARTEL_TVAPP
     echo "userdebug: TCL_PRODUCT_VERSION:      " $TCL_PRODUCT_VERSION
+    echo "TARGET_INSTALL_ARTEL_TVAPP:   " $INSTALL_ARTEL_TVAPP
 
     repo forall -c "pwd && git clean -xfd && git checkout -- ."
     rm -rf out
@@ -70,6 +98,8 @@ function pre_build_debug() {
         else
             echo "Update apps to SVN $HEAD_VERSION"
             ./kernel/android/pie/device/tv051/R1/update_debug_apps_rt2841.sh
+            echo "===================================save_apps_svn =============================="
+            ./kernel/android/pie/device/tv051/R2/save_apps_svn.sh
         fi
     fi
 
@@ -303,24 +333,6 @@ function copy_file() {
     cp -r $WORKSPACE/DailyBuild_RT2841_$var_md /home/RT2841_2851_dailybuild/
 }
 
-function scopy_file() {
-    var_md=$(date '+%m%d')
-    echo "make_userdebug::var_md=" $var_md
-
-    rm -rf $WORKSPACE/DailyBuild_RT2841*
-    mkdir -p $WORKSPACE/DailyBuild_RT2841_$var_md
-    cp -f $WORKSPACE/image_file_creator/install_USB.img $WORKSPACE/DailyBuild_RT2841_$var_md/$version.img
-    if [ x$CTS_build = "xy" ]; then
-        cp -f $WORKSPACE/image_file_creator/install_GSI.img $WORKSPACE/DailyBuild_RT2841_$var_md/$version_GSI.img
-        cp -f $ANDROID_DIR/signed-ota_update.zip $WORKSPACE/DailyBuild_RT2841_$var_md/signed-ota_rt2841_update.zip
-    else
-        cp -f $ANDROID_DIR/out/target/product/R1/*.zip $WORKSPACE/DailyBuild_RT2841_$var_md/signed-ota_rt2841_update.zip
-    fi
-    mv $WORKSPACE/manifest-master-$mmver.xml $WORKSPACE/DailyBuild_RT2841_$var_md/
-    md5sum $WORKSPACE/DailyBuild_RT2841_$var_md/* >$WORKSPACE/DailyBuild_RT2841_$var_md/MD5.TXT
-    cp -r $WORKSPACE/DailyBuild_RT2841_$var_md /home/RT2841_2851_dailybuild/
-}
-
 pre_build_debug
 build_android
 copy_file

crontask/dailybuild_rt2851_master.sh

@@ -20,6 +20,19 @@ COPYTMPNAME=$PROJECTNAME"_img"
 KEY_OPTION=$WORKSPACE"/kernel/android/pie/device/tv051/R1/rt2841Releasekeys"
 Temp_file=$WORKSPACE"/temp_file"
 RTK_TV_NEWMENU=FALSE
+INSTALL_SCAST_APP=true
+INSTALL_E_SHOW_APP=true
+INSTALL_ESTICKER_APP=false
+# 带S表示SCBC的;
+INSTALL_ESTICKER_S_APP=true
+INSTALL_PRIMEVIDEO_APP=false
+# 带S表示SCBC的;
+INSTALL_PRIMEVIDEO_S_APP=true
+# 导入公版蓝牙
+INSTALL_AUDIOCONNECT_APP=true
+# 导入松下蓝牙;
+INSTALL_AUDIOLINK_APP=false
+TARGET_INSTALL_ARTEL_TVAPP=false
 TCL_APPS_SVN_SRC_APK=https://odm-design-center-hz.tclking.com/svn/scbc_apps/trunk/app/apk
 
 # check cur path is android top
@@ -35,9 +48,22 @@ if [ ! -d "$Temp_file" ]; then
 fi
 
 function customize_app() {
-    rm -rf $ANDROID_DIR/vendor/tv051/app/PrimeVideo_Panasonic
-    rm -rf $ANDROID_DIR/vendor/tv051/app/Esticker_songxia
-    rm -rf $ANDROID_DIR/vendor/tv051/app/AudioLink
+    export INSTALL_SCAST_APP=$INSTALL_SCAST_APP
+    export INSTALL_E_SHOW_APP=$INSTALL_E_SHOW_APP
+    export INSTALL_ESTICKER_APP=$INSTALL_ESTICKER_APP
+    export INSTALL_ESTICKER_S_APP=$INSTALL_ESTICKER_S_APP
+    export INSTALL_PRIMEVIDEO_APP=$INSTALL_PRIMEVIDEO_APP
+    export INSTALL_PRIMEVIDEO_S_APP=$INSTALL_PRIMEVIDEO_S_APP
+    export INSTALL_AUDIOCONNECT_APP=$INSTALL_AUDIOCONNECT_APP
+    export INSTALL_AUDIOLINK_APP=$INSTALL_AUDIOLINK_APP
+    echo "INSTALL_SCAST_APP:      " $INSTALL_SCAST_APP
+    echo "INSTALL_E_SHOW_APP:      " $INSTALL_E_SHOW_APP
+    echo "INSTALL_ESTICKER_APP:      " $INSTALL_ESTICKER_APP
+    echo "INSTALL_ESTICKER_S_APP:      " $INSTALL_ESTICKER_S_APP
+    echo "INSTALL_PRIMEVIDEO_APP:      " $INSTALL_PRIMEVIDEO_APP
+    echo "INSTALL_PRIMEVIDEO_S_APP:      " $INSTALL_PRIMEVIDEO_S_APP
+    echo "INSTALL_AUDIOCONNECT_APP:      " $INSTALL_AUDIOCONNECT_APP
+    echo "INSTALL_AUDIOLINK_APP:      " $INSTALL_AUDIOLINK_APP
 }
 
 var_d=$(date '+%m%d%H')
@@ -53,7 +79,9 @@ function pre_build_debug() {
     Checkout_app=y
 
     export TCL_PRODUCT_VERSION=$version
+    export TARGET_INSTALL_ARTEL_TVAPP=$INSTALL_ARTEL_TVAPP
     echo "userdebug: TCL_PRODUCT_VERSION:      " $TCL_PRODUCT_VERSION
+    echo "TARGET_INSTALL_ARTEL_TVAPP:   " $INSTALL_ARTEL_TVAPP
 
     repo forall -c "pwd && git clean -xfd && git checkout -- ."
     rm -rf out
@@ -68,7 +96,9 @@ function pre_build_debug() {
             HEAD_VERSION="0000"
         else
             echo "Update apps to SVN $HEAD_VERSION"
-            ./kernel/android/pie/device/tv051/R2/update_debug_apps_rt2851.sh
+            ./kernel/android/pie/device/tv051/R1/update_debug_apps_rt2841.sh
+            echo "===================================save_apps_svn =============================="
+            ./kernel/android/pie/device/tv051/R2/save_apps_svn.sh
         fi
     fi
 
@@ -135,7 +165,11 @@ function make_kernel_android() {
     unzip -o $SQA_PATH/AV_FW/bluecore.video"$VIDEO_ADDNAME".zip -d $rtk_image
     unzip -o $SQA_AUDIO_FW_PATH/AV_FW/bluecore.audio"$AUDIO_ADDNAME".zip -d $rtk_image
     cp -f $ANDROID_DIR/vendor/realtek/optee_os/optee_img_v3/tee.bin $rtk_image
-    cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    if [ x$CUSTOMER = "xNEWSAN" ]; then
+        cp -f $WORKSPACE/SQA_DailyBuild/6in1Board/bootcode/$NEWSAN_BOOTCODE/bootloader.tar $rtk_image
+    else
+        cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    fi
     cp -f $WORKSPACE/image_file_creator/components/packages/package7/customer/$CUS_ID/bootfile.image $rtk_image
     cp -f $Temp_file/* $rtk_image
 
@@ -172,7 +206,11 @@ function make_kernel_android_noclean() {
     unzip -o $SQA_PATH/AV_FW/bluecore.video"$VIDEO_ADDNAME".zip -d $rtk_image
     unzip -o $SQA_AUDIO_FW_PATH/AV_FW/bluecore.audio"$AUDIO_ADDNAME".zip -d $rtk_image
     cp -f $ANDROID_DIR/vendor/realtek/optee_os/optee_img_v3/tee.bin $rtk_image
-    cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    if [ x$CUSTOMER = "xNEWSAN" ]; then
+        cp -f $WORKSPACE/SQA_DailyBuild/6in1Board/bootcode/$NEWSAN_BOOTCODE/bootloader.tar $rtk_image
+    else
+        cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    fi
     cp -f $Temp_file/* $rtk_image
     cd $rtk_image
     ./process.sh
@@ -201,7 +239,11 @@ function make_ota() {
     unzip -o $SQA_PATH/AV_FW/bluecore.video"$VIDEO_ADDNAME".zip -d $rtk_image
     unzip -o $SQA_AUDIO_FW_PATH/AV_FW/bluecore.audio"$AUDIO_ADDNAME".zip -d $rtk_image
     cp -f $ANDROID_DIR/vendor/realtek/optee_os/optee_img_v3/tee.bin $rtk_image
-    cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    if [ x$CUSTOMER = "xNEWSAN" ]; then
+        cp -f $WORKSPACE/SQA_DailyBuild/6in1Board/bootcode/$NEWSAN_BOOTCODE/bootloader.tar $rtk_image
+    else
+        cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $rtk_image
+    fi
     cp -f $WORKSPACE/image_file_creator/components/packages/package7/customer/$CUS_ID/bootfile.image $rtk_image
     cp -f $WORKSPACE/image_file_creator/components/tmp/pkgfile/package7/factory.tar $rtk_image
 
@@ -247,7 +289,11 @@ function make_img() {
     #add impdata
     cp -f $ANDROID_DIR/out/target/product/$ROOTFS_NAME/impdata.img components/packages/package7/
     # Make image with bootcode
-    cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $WORKSPACE/image_file_creator/components/packages/package7/
+    if [ x$CUSTOMER = "xNEWSAN" ]; then
+        cp -f $WORKSPACE/SQA_DailyBuild/6in1Board/bootcode/$NEWSAN_BOOTCODE/bootloader.tar $WORKSPACE/image_file_creator/components/packages/package7/
+    else
+        cp -f $WORKSPACE/SQA_DailyBuild/bootcode/$BOOTCODE/bootloader.tar $WORKSPACE/image_file_creator/components/packages/package7/
+    fi
     make image PACKAGES=package7 install_ap=1 install_bootloader=1 CUSTOMER_ID=$CUS_ID PROJECT_NAME=$PROJECTNAME install_impdata=1
     mv install.img install_USB.img
     mv install.img.impdata install.img.impdata_USB