Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a70fabc authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2892-master-a15_build' into 'master' 

Initial android 15 support

See merge request !104
parents 8e360924 1aadd78c

build-community.sh

+16 −10
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ for branch in ${BRANCH_NAME//,/ }; do 
    elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then

      themuppets_branch="lineage-21.0"

      android_version="14"

    elif [[ "${BRANCH_NAME}" =~ $regex_part1"a15"$regex_part2 || "${BRANCH_NAME}" =~ "a15" ]]; then

      themuppets_branch="lineage-22.1"

      android_version="15"

    else

      echo ">> [$(date)] Building branch $branch is not (yet) suppported"

      exit 1
@@ -162,7 +165,10 @@ for branch in ${BRANCH_NAME//,/ }; do 
    fi



    echo ">> [$(date)] Running: $repo_cmd" | tee -a "$repo_log"

    eval "$repo_cmd" &>>"$repo_log" || { echo ">> [$(date)] ERROR: Failed to initialize repository" | tee -a "$repo_log"; exit 1; }

    eval "$repo_cmd" &>>"$repo_log" || {

      echo ">> [$(date)] ERROR: Failed to initialize repository" | tee -a "$repo_log"

      exit 1

    }



    # Copy local manifests to the appropriate folder in order take them into consideration

    echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'"

src/apex.list

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ com.android.adbd 
com.android.adservices

com.android.adservices.api

com.android.appsearch

com.android.appsearch.apk

com.android.art

com.android.bluetooth

com.android.btservices
@@ -13,9 +14,13 @@ com.android.conscrypt 
com.android.devicelock

com.android.extservices

com.android.graphics.pdf

com.android.hardware.authsecret

com.android.hardware.biometrics.face.virtual

com.android.hardware.biometrics.fingerprint.virtual

com.android.hardware.boot

com.android.hardware.cas

com.android.hardware.neuralnetworks

com.android.hardware.rebootescrow

com.android.hardware.wifi

com.android.healthfitness

com.android.hotspot2.osulogin
@@ -27,9 +32,11 @@ com.android.mediaprovider 
com.android.nearby.halfsheet

com.android.networkstack.tethering

com.android.neuralnetworks

com.android.nfcservices

com.android.ondevicepersonalization

com.android.os.statsd

com.android.permission

com.android.profiling

com.android.resolv

com.android.rkpd

com.android.runtime

src/apex_apk.list

+3 −0
Original line number Diff line number Diff line 
AdServicesApk

FederatedCompute

HalfSheetUX

HealthConnectBackupRestore

HealthConnectController

OsuLogin

SafetyCenterResources

ServiceConnectivityResources

src/build.sh

+15 −12
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ exit_script() { 
sync_successful=true



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)(-[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^^}



if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
@@ -128,6 +128,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then

    themuppets_branch="lineage-21.0"

    android_version="14"

  elif [[ "${BRANCH_NAME}" =~ $regex_part1"a15"$regex_part2 || "${BRANCH_NAME}" =~ "a15" ]]; then

    themuppets_branch="lineage-22.1"

    android_version="15"

  else

    echo ">> [$(date)] Building branch $BRANCH_NAME is not (yet) supported"

    exit 1
@@ -380,7 +383,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
          build_success=true

        fi

      fi

    elif [ "$android_version_major" -lt "12" ]; then

    elif [ "$android_version_major" -lt "12" ] || [ "${RELEASE_TYPE}" = "test" ]; then

      if [ "${BUILD_SUPER_IMAGE}" = true ]; then

        if breakfast_device && mka bacon superimage; then

          build_success=true