Android/vendor_gapps
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gapps: Use apktool to build RRO overlays

Browse Source 
The following fields in the AndroidManifest.xml are different:

Built in AOSP-tree version:
android:compileSdkVersion="33"
android:compileSdkVersionCodename="13"
platformBuildVersionCode="33"
platformBuildVersionName="13"

Build with apktool version:
android:compileSdkVersion="23"
android:compileSdkVersionCodename="6.0-2438415"
platformBuildVersionCode="23"
platformBuildVersionName="6.0-2438415"
This commit is contained in:
Paul Keith
2023-09-19 01:13:23 -05:00
parent d06706f0d8
commit d70e71a0bc
12 changed files with 80 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
overlay/build_overlays.sh
View File

@@ -5,42 +5,23 @@ set -e
GARCH=$1
GOUT=$2
APKTOOL=$GAPPS_TOP/build/apktool/apktool_2.8.1.jar
APKSIGNER=$GAPPS_TOP/build/sign/apksigner.jar
APK_KEY_PK8=$GAPPS_TOP/build/sign/testkey.pk8
APK_KEY_PEM=$GAPPS_TOP/build/sign/testkey.x509.pem
SCRIPT_DIR=$(dirname "$0")
cd "$SCRIPT_DIR"
OVERLAYS=$(for dir in $(ls -d */); do echo ${dir%%/}; done)
croot 2>/dev/null || cd ../../../
source build/envsetup.sh
breakfast gapps_$GARCH
m installclean
mkdir -p $OUT # $OUT may not exist yet, but we need to start creating the log file now
m $OVERLAYS | tee $OUT/.log
RELOUT=$(echo $OUT | sed "s#^${ANDROID_BUILD_TOP}/##")
LOC="$(cat $OUT/.log | sed -r -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' -e 's/^\[ {0,2}[0-9]{1,3}% [0-9]{1,6}\/[0-9]{1,6}\] +//' \
| grep '^Install: ' | grep "$RELOUT" | cut -d ':' -f 2)"
FILES=$(echo $LOC | tr " " "\n" | sed "s#.*${RELOUT}##" | sort | uniq)
for TARGET in $FILES; do
mkdir -p $(dirname $GOUT/$TARGET) && cp $OUT/$TARGET $GOUT/$TARGET
for OVERLAY in $OVERLAYS; do
PARTITION=$(grep -Eo "\w+_specific: true" $OVERLAY/Android.bp | sed "s/_specific.*$//")
OVERLAY_TARGET_DIR="$GOUT/system/$PARTITION/overlay/"
OVERLAY_TARGET="$OVERLAY_TARGET_DIR/$OVERLAY.apk"
test -d $OVERLAY_TARGET_DIR || mkdir -p $OVERLAY_TARGET_DIR
java -Xmx2048m -jar $APKTOOL b $OVERLAY -o $OVERLAY_TARGET --use-aapt2 >> $GLOG 2>&1
java -Xmx2048m -jar $APKSIGNER sign --key $APK_KEY_PK8 --cert $APK_KEY_PEM $OVERLAY_TARGET
rm $OVERLAY_TARGET.idsig
done
# Generate temporary signing keys
PRIVATE_KEY=$(mktemp)
PRIVATE_KEY_PK8=$(mktemp)
PUBLIC_KEY_PEM=$(mktemp)
openssl genrsa -f4 2048 > $PRIVATE_KEY
openssl pkcs8 -in $PRIVATE_KEY -topk8 -outform DER -out $PRIVATE_KEY_PK8 -nocrypt
openssl req -new -x509 -sha256 -key $PRIVATE_KEY -out $PUBLIC_KEY_PEM -days 10000 -subj '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/emailAddress=android@android.com'
# Resign all overlay apks
for TARGET in $FILES; do
java -Xmx2048m -jar $TOP/build/sign/apksigner.jar sign --key $PRIVATE_KEY_PK8 --cert $PUBLIC_KEY_PEM $GOUT/$TARGET
rm $GOUT/$TARGET.idsig
done
# RIP
rm $PRIVATE_KEY $PRIVATE_KEY_PK8 $PUBLIC_KEY_PEM