Revert "[temporary] use experimental-releases"

This reverts commit 11ba671.

Author: thestinger

finalize.sh

@@ -9,7 +9,7 @@ source "$(dirname ${BASH_SOURCE[0]})/common.sh"
 [[ -n $BUILD_NUMBER ]] || user_error "expected BUILD_NUMBER in the environment"
 [[ -n $OUT ]] || user_error "expected OUT in the environment"
 
-readonly releases=experimental-releases/$BUILD_NUMBER
+readonly releases=releases/$BUILD_NUMBER
 mkdir -p $releases
 cp "$OUT/otatools.zip" "$releases/$TARGET_PRODUCT-otatools.zip"
 cp "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files.zip" "$releases/"

generate-delta.sh

@@ -21,9 +21,9 @@ script/decrypt-keys.sh "$KEY_DIR"
 
 export PATH="$PWD/prebuilts/build-tools/linux-x86/bin:$PATH"
 export PATH="$PWD/prebuilts/build-tools/path/linux-x86:$PATH"
-export PATH="$PWD/experimental-releases/$NEW/release-$DEVICE-$NEW/bin:$PATH"
+export PATH="$PWD/releases/$NEW/release-$DEVICE-$NEW/bin:$PATH"
 
-cd "experimental-releases/$NEW"
+cd "releases/$NEW"
 
 ota_from_target_files "${EXTRA_OTA[@]}" -k "$KEY_DIR/releasekey" \
     -i ../$OLD/release-$DEVICE-$OLD/$DEVICE-target_files.zip \

generate-release.sh

@@ -12,7 +12,7 @@ DEVICE=$1
 BUILD_NUMBER=$2
 
 PERSISTENT_KEY_DIR=keys/$DEVICE
-RELEASE_OUT=experimental-releases/$BUILD_NUMBER/release-$DEVICE-$BUILD_NUMBER
+RELEASE_OUT=releases/$BUILD_NUMBER/release-$DEVICE-$BUILD_NUMBER
 
 # decrypt keys in advance for improved performance and modern algorithm support
 KEY_DIR=$(mktemp -d /dev/shm/generate-release.XXXXXXXXXX)
@@ -25,11 +25,11 @@ export PATH="$PWD/prebuilts/build-tools/linux-x86/bin:$PATH"
 export PATH="$PWD/prebuilts/build-tools/path/linux-x86:$PATH"
 
 TARGET_FILES=$DEVICE-target_files.zip
-TARGET_FILES_INPUT=$PWD/experimental-releases/$BUILD_NUMBER/$TARGET_FILES
+TARGET_FILES_INPUT=$PWD/releases/$BUILD_NUMBER/$TARGET_FILES
 
 rm -rf $RELEASE_OUT
 mkdir -p $RELEASE_OUT
-unzip experimental-releases/$BUILD_NUMBER/$DEVICE-otatools.zip -d $RELEASE_OUT
+unzip releases/$BUILD_NUMBER/$DEVICE-otatools.zip -d $RELEASE_OUT
 cd $RELEASE_OUT
 # remove duplicate Android.bp from unpacked otatools, otherwise they get
 # detected by soong, which breaks subsequent builds