Move key dir to a var (5ec12af4) · Commits · e / os / docker-lineage-cicd

src/build.sh

+12 −11

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,7 @@ sync_successful=true
	use_openjdk_from_ubuntu=false		use_openjdk_from_ubuntu=false
	branch_dir=$(sed -E 's/^v[0-9](\.[0-9]){0,2}(-(beta\|alpha\|rc)(\.[0-9]){0,1}){0,1}-(nougat\|oreo\|pie\|q\|r\|s\|t\|u\|a14\|a15)(-[a-zA-Z0-9_])$/\5/' <<<"${BRANCH_NAME}")		branch_dir=$(sed -E 's/^v[0-9](\.[0-9]){0,2}(-(beta\|alpha\|rc)(\.[0-9]){0,1}){0,1}-(nougat\|oreo\|pie\|q\|r\|s\|t\|u\|a14\|a15)(-[a-zA-Z0-9_])$/\5/' <<<"${BRANCH_NAME}")
	branch_dir=${branch_dir^^}		branch_dir=${branch_dir^^}
			default_key_dir="user-keys"

	if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then		if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	vendor=lineage		vendor=lineage
	@@ -269,11 +270,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	if [ "$SIGN_BUILDS" = true ]; then		if [ "$SIGN_BUILDS" = true ]; then
	echo ">> [$(date)] Adding keys path ($KEYS_DIR)"		echo ">> [$(date)] Adding keys path ($KEYS_DIR)"
	# Soong (Android 9+) complains if the signing keys are outside the build path		# Soong (Android 9+) complains if the signing keys are outside the build path
	ln -sf "$KEYS_DIR" user-keys		ln -sf "$KEYS_DIR" $default_key_dir
	if [ "$android_version_major" -lt "10" ]; then		if [ "$android_version_major" -lt "10" ]; then
	sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\nPRODUCT_EXTRA_RECOVERY_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"		sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := $default_key_dir/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := $default_key_dir/releasekey\nPRODUCT_EXTRA_RECOVERY_KEYS := $default_key_dir/releasekey\n\n;" "vendor/$vendor/config/common.mk"
	elif [ "$android_version_major" -lt "12" ]; then		elif [ "$android_version_major" -lt "12" ]; then
	sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := user-keys/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := user-keys/releasekey\n\n;" "vendor/$vendor/config/common.mk"		sed -i "1s;^;PRODUCT_DEFAULT_DEV_CERTIFICATE := $default_key_dir/releasekey\nPRODUCT_OTA_PUBLIC_KEYS := $default_key_dir/releasekey\n\n;" "vendor/$vendor/config/common.mk"
	fi		fi
	fi		fi

	@@ -413,24 +414,24 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
	E_VERSION=e-$E_BRANCH_NAME-$BUILD_NUMBER-$RELEASE_TYPE-${DEVICE}.zip		E_VERSION=e-$E_BRANCH_NAME-$BUILD_NUMBER-$RELEASE_TYPE-${DEVICE}.zip

	if [ "$SIGN_BUILDS" = true ]; then		if [ "$SIGN_BUILDS" = true ]; then
	SIGN_TARGETS=(-o -d "user-keys")		SIGN_TARGETS=(-o -d "$default_key_dir")
	SIGN_KEY=(-k "user-keys/releasekey")		SIGN_KEY=(-k "$default_key_dir/releasekey")
	fi		fi

	if [ "$android_version_major" -ge 12 ] && [ "$SIGN_BUILDS" = true ]; then		if [ "$android_version_major" -ge 12 ] && [ "$SIGN_BUILDS" = true ]; then
	APEX_PACKAGE_LIST=$(cat "/root/apex.list")		APEX_PACKAGE_LIST=$(cat "/root/apex.list")
	for PACKAGE in $APEX_PACKAGE_LIST; do		for PACKAGE in $APEX_PACKAGE_LIST; do
	if [ -f "user-keys/$PACKAGE.pem" ] &&		if [ -f "$default_key_dir/$PACKAGE.pem" ] &&
	[ -f "user-keys/$PACKAGE.x509.pem" ] &&		[ -f "$default_key_dir/$PACKAGE.x509.pem" ] &&
	[ -f "user-keys/$PACKAGE.pk8" ]; then		[ -f "$default_key_dir/$PACKAGE.pk8" ]; then
	SIGN_TARGETS+=(--extra_apks "$PACKAGE.apex=user-keys/$PACKAGE"		SIGN_TARGETS+=(--extra_apks "$PACKAGE.apex=$default_key_dir/$PACKAGE"
	--extra_apex_payload_key "$PACKAGE.apex=user-keys/$PACKAGE.pem")		--extra_apex_payload_key "$PACKAGE.apex=$default_key_dir/$PACKAGE.pem")
	fi		fi
	done		done

	APEXAPK_PACKAGE_LIST=$(cat "/root/apex_apk.list")		APEXAPK_PACKAGE_LIST=$(cat "/root/apex_apk.list")
	for PACKAGE in $APEXAPK_PACKAGE_LIST; do		for PACKAGE in $APEXAPK_PACKAGE_LIST; do
	SIGN_TARGETS+=(--extra_apks "$PACKAGE.apk=user-keys/releasekey")		SIGN_TARGETS+=(--extra_apks "$PACKAGE.apk=$default_key_dir/releasekey")
	done		done
	fi		fi