Merge branch 'main-14' into android-14.0

.github/workflows/build.yml

@@ -43,7 +43,9 @@ jobs:
                      --privileged \
                      --name treble \
                      --volume ${{ github.workspace }}/builds:/root/builds \
+
                      --volume ${{ github.workspace }}/vendor_ponces-priv:/aosp/vendor/ponces-priv \
+
                      --volume ${{ github.workspace }}/config/ota.json:/aosp/treble_aosp/config/ota.json \
                      ponces/treble treblebuild
 

build.sh

@@ -127,7 +127,7 @@ generateOta() {
             [[ "$filename" == *"-vndklite"* ]] && vndk="-vndklite" || vndk=""
             name="treble_${arch}_b${variant}N${vndk}"
             size=$(wc -c $file | awk '{print $1}')
-            url="https://github.com/ponces/treble_aosp/releases/download/$version/$filename"
+            url="https://github.com/archfx/epsilon/releases/download/$version/$filename"
             json="${json} {\"name\": \"$name\",\"size\": \"$size\",\"url\": \"$url\"},"
         done
         json="${json%?}]}"

build/default.xml

@@ -3,6 +3,10 @@
   <remote name="github" fetch="https://github.com" />
   <remote name="gitlab" fetch="https://gitlab.com" />
 
+  <!-- Taskbar -->
+  <project name="farmerbb/Taskbar" path="packages/apps/taskbar" remote="github" revision="master" />
+
+
   <!-- TrebleDroid -->
   <project name="TrebleDroid/device_phh_treble" path="device/phh/treble" remote="github" revision="android-14.0" />
   <project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />

upload.sh

@@ -13,8 +13,8 @@ set -e
 BL=$PWD/treble_aosp
 BD=$HOME/builds
 TAG="$(date +v%Y.%m.%d)"
-GUSER="ponces"
-GREPO="treble_aosp"
+GUSER="archfx"
+GREPO="epsilon"
 
 SKIPOTA=false
 if [ "$1" == "--skip-ota" ]; then