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

Commit 40a8231a authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '4112devices-a16-fix-pixel-inline-kernel-manifest-fail' into 'v3.6-a16' 

a16: Fix Pixel inline kernel manifest sync failure issue

See merge request !246
parents e8281d58 6dc1905b

build/envsetup.sh

+4 −1
Original line number Original line Diff line number Diff line
@@ -935,7 +935,7 @@ function build_kernel() { 
        echo "Skipping kernel build"

        echo "Skipping kernel build"

        return

        return

    fi

    fi

    local lineage_version="lineage-$(_get_build_var_cached PRODUCT_VERSION_MAJOR).$(_get_build_var_cached PRODUCT_VERSION_MINOR)"

    local lineage_version="$(_get_build_var_cached LINEAGE_UPSTREAM_VERSION)"





    local target_kernel_device="$(_get_build_var_cached TARGET_KERNEL_DEVICE)"

    local target_kernel_device="$(_get_build_var_cached TARGET_KERNEL_DEVICE)"

    local target_kernel_dir="${ANDROID_BUILD_TOP}/$(_get_build_var_cached TARGET_KERNEL_DIR)"

    local target_kernel_dir="${ANDROID_BUILD_TOP}/$(_get_build_var_cached TARGET_KERNEL_DIR)"
@@ -983,6 +983,9 @@ function build_kernel() { 
        if [ -n "${REPO_VERSION}" ]; then

        if [ -n "${REPO_VERSION}" ]; then

            repo_init_args+=("--repo-rev" "${REPO_VERSION}")

            repo_init_args+=("--repo-rev" "${REPO_VERSION}")

        fi

        fi

        if [ -f "${ANDROID_BUILD_TOP}/.repo/local_manifests/proprietary_gitlab.xml" ]; then

            repo_init_args+=("-g" "default,-darwin,-muppets,muppets_${LINEAGE_BUILD}")

        fi





        yes | repo init -u https://github.com/LineageOS/${target_kernel_manifest}.git ${repo_init_args[@]} || [ $? -eq 141 ]

        yes | repo init -u https://github.com/LineageOS/${target_kernel_manifest}.git ${repo_init_args[@]} || [ $? -eq 141 ]

        if [ $? -ne 0 ]; then

        if [ $? -ne 0 ]; then

config/version.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ ANDROID_LETTER := a16 
PRODUCT_VERSION_MAJOR = 3

PRODUCT_VERSION_MAJOR = 3

PRODUCT_VERSION_MINOR = 6

PRODUCT_VERSION_MINOR = 6

PRODUCT_VERSION_MAINTENANCE := 0

PRODUCT_VERSION_MAINTENANCE := 0

LINEAGE_UPSTREAM_VERSION := lineage-23.0

PRODUCT_PRERELEASE_STRING =

PRODUCT_PRERELEASE_STRING =





ifdef PRODUCT_PRERELEASE

ifdef PRODUCT_PRERELEASE