Refresh the latest script versions + preparation for local mode.
Bug: 260755259
Test: local run
Change-Id: I45d3651bd4b837e1338535f98d7256ca9b47e089
diff --git a/tools/finalization/step-2.sh b/tools/finalization/step-2.sh
index 926b850..d0b24ae 100755
--- a/tools/finalization/step-2.sh
+++ b/tools/finalization/step-2.sh
@@ -12,7 +12,6 @@
Test: build";
repo upload --cbr --no-verify -o nokeycheck -t -y . ;
- git clean -fdx ; git reset --hard ;
fi'
}
@@ -25,14 +24,11 @@
# prebuilts etc
source $top/build/make/tools/finalization/finalize-sdk-rel.sh
- # Update prebuilts.
- "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -b ${FINAL_BUG_ID} -f ${FINAL_MAINLINE_EXTENSION} -r "${FINAL_MAINLINE_SDK_COMMIT_MESSAGE}" ${FINAL_MAINLINE_SDK_BUILD_ID}
+ # move all changes to finalization branch/topic and upload to gerrit
+ commit_step_2_changes
# build to confirm everything is OK
AIDL_FROZEN_REL=true $m
-
- # move all changes to finalization branch/topic and upload to gerrit
- commit_step_2_changes
}
finalize_step_2_main