[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 3082e6f68d -s ours
am skip reason: Merged-In I9eaee6261f4c578ceee7d49080d24261689802bf with SHA-1 d2b3602029 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/27145008
Change-Id: I590da4e959e72a4c20dae9deca80ac9f4784a576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 9a6f5ad..6853543 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -25,6 +25,10 @@
then
RADIOSRC=radio.img
fi
+if test "$GSCFIRMWARESRC" = ""
+then
+ GSCFIRMWARESRC=dauntless
+fi
if test "$SLEEPDURATION" = ""
then
SLEEPDURATION=5
@@ -52,6 +56,9 @@
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
fi
+# Extract the GSC firmware
+unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip VENDOR/firmware/$GSCFIRMWARESRC/*
+
# Copy the various images in their staging location
cp ${SRCPREFIX}$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
if test "$XLOADER" != ""
@@ -82,6 +89,7 @@
cp $CDMARADIOFILE tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img
fi
fi
+cp -r tmp/VENDOR/firmware/$GSCFIRMWARESRC/* tmp/$PRODUCT-$VERSION
# Write flash-all.sh
cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF