Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2262df7 authored by Jackeagle's avatar Jackeagle
Browse files

Revert "build.sh: Conditionally use full path for releasetools only for... 

Revert "build.sh: Conditionally use full path for releasetools only for Android version less than 12"

This reverts commit 569b7fcb.
parent 569b7fcb

src/build.sh

+19 −32
Original line number Diff line number Diff line
@@ -434,26 +434,16 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
      fi



      if [ "$(find $OUT/obj/PACKAGING/target_files_intermediates/ -name *-target_files*.zip -print -quit)" ]; then

        if [ "$android_version_major" -lt "12" ]; then

        ./build/tools/releasetools/sign_target_files_apks "${SIGN_TARGETS[@]}" \

          $OUT/obj/PACKAGING/target_files_intermediates/*-target_files*.zip "$OUT/$TARGET_FILES"

        else

          sign_target_files_apks "${SIGN_TARGETS[@]}" \

            $OUT/obj/PACKAGING/target_files_intermediates/*-target_files*.zip "$OUT/$TARGET_FILES"

        fi



        # Generate OTA zip

        echo ">> [$(date)] Generating OTA zip from target-files-package"

        if [ "$SIGN_BUILDS" = true ]; then

          SIGN_KEY=(-k "user-keys/releasekey")

        fi

        if [ "$android_version_major" -lt "12" ]; then

        ./build/tools/releasetools/ota_from_target_files --backup=true "${SIGN_KEY[@]}" "$OUT/$TARGET_FILES" \

          "$OUT/$E_VERSION"

        else

          ota_from_target_files --backup=true "${SIGN_KEY[@]}" "$OUT/$TARGET_FILES" \

            "$OUT/$E_VERSION"

        fi



        if [ ! -f "$OUT/$E_VERSION" ]; then

          clean_up
@@ -464,11 +454,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
        # Flash: fastboot update update.zip

        FASTBOOT_PACKAGE="FASTBOOT-$E_VERSION"

        echo ">> [$(date)] Generating fastboot zip from target-files-package"

        if [ "$android_version_major" -lt "12" ]; then

        ./build/tools/releasetools/img_from_target_files "$OUT/$TARGET_FILES" "$OUT/$FASTBOOT_PACKAGE"

        else

          img_from_target_files "$OUT/$TARGET_FILES" "$OUT/$FASTBOOT_PACKAGE"

        fi



        if [ ! -f "$OUT/$FASTBOOT_PACKAGE" ]; then

          clean_up

          exit_script