updated-20220222

thefiredragon · Feb 22, 2022 · 79a9cd7 · 79a9cd7
1 parent e687107
commit 79a9cd7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 55 deletions.
diff --git a/build.sh b/build.sh
@@ -28,12 +28,12 @@ BUILD_DATE="$(date +%Y%m%d)"
 WITHOUT_CHECK_API=true
 BL=$PWD/treble_build_pe
 BD=$HOME/builds
-VERSION="v401"
+VERSION="v402"
 
 if [ ! -d .repo ]
 then
     echo "Initializing PE workspace"
-    repo init -u https://github.com/thefiredragon/manifest -b twelve
+    repo init -u https://github.com/PixelExperience/manifest -b twelve
     echo ""
 
     echo "Preparing local manifest"
@@ -67,34 +67,30 @@ echo "Applying personal patches"
 bash $BL/apply-patches.sh $BL personal
 echo ""
 
-
 buildTrebleApp() {
     cd treble_app
     bash build.sh release
     cp TrebleApp.apk ../vendor/hardware_overlay/TrebleApp/app.apk
     cd ..
 }
 
-buildVariant() {
-    lunch ${1}-userdebug
+buildRegularVariant() {
+    lunch treble_arm64_bvS-userdebug
     make installclean
     make -j$(nproc --all) systemimage
-#    make vndk-test-sepolicy
-    mv $OUT/system.img $BD/system-$1.img
-#    buildSlimVariant $1
-    rm -rf out/target/product/phhgsi*
+    make vndk-test-sepolicy
+    mv $OUT/system.img $BD/system-treble_arm64_bvS.img
 }
 
-#buildSlimVariant() {
-#    wget https://gist.github.com/ponces/891139a70ee4fdaf1b1c3aed3a59534e/raw/slim.patch -O /tmp/slim.patch
-#    (cd vendor/gapps && git am /tmp/slim.patch)
-#    lunch ${1}-userdebug
-#    make -j$(nproc --all) systemimage
-#    mv $OUT/system.img $BD/system-$1-slim.img
-#    (cd vendor/gapps && git reset --hard HEAD~1)
-#}
+buildSlimVariant() {
+    wget https://gist.github.com/ponces/891139a70ee4fdaf1b1c3aed3a59534e/raw/slim.patch -O /tmp/slim.patch
+    (cd vendor/gapps && git am /tmp/slim.patch)
+    make -j$(nproc --all) systemimage
+    mv $OUT/system.img $BD/system-treble_arm64_bvS-slim.img
+    (cd vendor/gapps && git reset --hard HEAD~1)
+}
 
-#buildSasImages() {
+#buildVndkliteVariant() {
 #    cd sas-creator
 #    sudo bash lite-adapter.sh 64 $BD/system-treble_arm64_bvS.img
 #    cp s.img $BD/system-treble_arm64_bvS-vndklite.img
@@ -103,10 +99,9 @@ buildVariant() {
 #}
 
 generatePackages() {
-    BASE_IMAGE=$BD/system-treble_arm64_bvS.img
-    xz -cv $BASE_IMAGE -T0 > $BD/PixelExperience_arm64-ab-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
-#    xz -cv ${BASE_IMAGE%.img}-vndklite.img -T0 > $BD/PixelExperience_arm64-ab-vndklite-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
-#    xz -cv ${BASE_IMAGE%.img}-slim.img -T0 > $BD/PixelExperience_arm64-ab-slim-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
+    xz -cv $BD/system-treble_arm64_bvS.img -T0 > $BD/PixelExperience_arm64-ab-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
+   # xz -cv $BD/system-treble_arm64_bvS-vndklite.img -T0 > $BD/PixelExperience_arm64-ab-vndklite-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
+    xz -cv $BD/system-treble_arm64_bvS-slim.img -T0 > $BD/PixelExperience_arm64-ab-slim-12.0-$BUILD_DATE-UNOFFICIAL.img.xz
     rm -rf $BD/system-*.img
 }
 
@@ -123,7 +118,7 @@ generateOtaJson() {
                 "arm64-ab-slim") name="treble_arm64_bvS-slim";;
             esac
             size=$(wc -c $file | awk '{print $1}')
-            url="https://github.com/thefiredragon/treble_build_pe/releases/download/$VERSION/$(basename $file)"
+            url="https://github.com/ponces/treble_build_pe/releases/download/$VERSION/$(basename $file)"
             json="${json} {\"name\": \"$name\",\"size\": \"$size\",\"url\": \"$url\"},"
         done
         json="${json%?}]}"
@@ -132,13 +127,14 @@ generateOtaJson() {
 }
 
 buildTrebleApp
-buildVariant treble_arm64_bvS
-#buildSasImages
+buildRegularVariant
+buildSlimVariant
+#buildVndkliteVariant
 generatePackages
 generateOtaJson
 
 END=`date +%s`
 ELAPSEDM=$(($(($END-$START))/60))
 ELAPSEDS=$(($(($END-$START))-$ELAPSEDM*60))
 echo "Buildbot completed in $ELAPSEDM minutes and $ELAPSEDS seconds"
-echo ""
+echo ""
diff --git a/ota.json b/ota.json
@@ -1,36 +1,11 @@
 {
   "version": "v401",
-  "date": "1644327452",
+  "date": "1645443935",
   "variants": [
-    {
-      "name": "treble_a64_bvS",
-      "size": "1275878544",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm32_binder64-ab-12.0-20220208-UNOFFICIAL.img.xz"
-    },
-    {
-      "name": "treble_arm64_bvS-vndklite",
-      "size": "1422152904",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm64-ab-vndklite-12.0-20220208-UNOFFICIAL.img.xz"
-    },
-    {
-      "name": "treble_arm64_bvS-slim",
-      "size": "1048668868",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm64-ab-slim-12.0-20220208-UNOFFICIAL.img.xz"
-    },
-    {
-      "name": "treble_a64_bvS-vndklite",
-      "size": "1286023052",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm32_binder64-ab-vndklite-12.0-20220208-UNOFFICIAL.img.xz"
-    },
-    {
-      "name": "treble_a64_bvS-slim",
-      "size": "949337564",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm32_binder64-ab-slim-12.0-20220208-UNOFFICIAL.img.xz"
-    },
     {
       "name": "treble_arm64_bvS",
-      "size": "1374076884",
-      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm64-ab-12.0-20220208-UNOFFICIAL.img.xz"
+      "size": "1439199556",
+      "url": "https://github.com/thefiredragon/treble_build_pe/releases/download/v401/PixelExperience_arm64-ab-12.0-20220221-UNOFFICIAL.img.xz"
     }
   ]
-}
+}