Skip to content

Commit

Permalink
Ignore proprietary.xml not being present
Browse files Browse the repository at this point in the history
  • Loading branch information
petefoth committed Dec 13, 2024
2 parents 20c6098 + 078d5aa commit d286c86
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ ENV USER root
# WARNING: disabling this may slow down a lot your builds!
ENV USE_CCACHE 1

# By default we won't include the components from vendor/partner-gms
ENV WITH_GMS false

# ccache maximum size. It should be a number followed by an optional suffix: k,
# M, G, T (decimal), Ki, Mi, Gi or Ti (binary). The default suffix is G. Use 0
# for no limit.
Expand Down
2 changes: 1 addition & 1 deletion src/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ visibility = ["//visibility:public"],
_EOB

case "$BRANCH_NAME" in
"lineage-19.1" | "lineage-20.0" | "lineage-21.0" )
"lineage-19.1" | "lineage-20.0" | "lineage-21.0" | "lineage-22.0" )
build_file="new_build.sh"
;;
* )
Expand Down
7 changes: 6 additions & 1 deletion src/new_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ if [ -n "$branch" ] && [ -n "$devices" ]; then
themuppets_branch="lineage-21.0"
android_version="14"
;;
lineage-22.0*)
themuppets_branch="lineage-22.0"
android_version="15"
;;
*)
echo ">> [$(date)] Building branch $branch is not (yet) suppported"
exit 1
Expand Down Expand Up @@ -234,8 +238,9 @@ for codename in ${devices//,/ }; do
# Set device specific logfils
DEBUG_LOG="$LOGS_DIR/$logsubdir/$branch-$builddate-$RELEASE_TYPE-$codename.log"
## Pick up TheMuppets manifest if required
rm -f .repo/local_manifests/proprietary.xml
rm -f .repo/local_manifests/proprietary.xml || true
if [ "$INCLUDE_PROPRIETARY" = true ]; then
touch .repo/local_manifests/proprietary.xml
wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/$themuppets_branch/muppets.xml"
/root/build_manifest.py --remote "https://gitlab.com" --remotename "gitlab_https" \
"https://gitlab.com/the-muppets/manifest/raw/$themuppets_branch/muppets.xml" .repo/local_manifests/proprietary_gitlab.xml
Expand Down

0 comments on commit d286c86

Please sign in to comment.