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

Commit 8f58fc40 authored by Jackeagle's avatar Jackeagle
Browse files

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

build_kernel: Use LINEAGE_UPSTREAM_VERSION for kernel manifest branch

See merge request !244
parents b0df091b 47f1854c

build/envsetup.sh

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

        return

    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_dir="${ANDROID_BUILD_TOP}/$(_get_build_var_cached TARGET_KERNEL_DIR)"

config/version.mk

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

PRODUCT_VERSION_MINOR = 6

PRODUCT_VERSION_MAINTENANCE := 0

LINEAGE_UPSTREAM_VERSION := lineage-23.0

PRODUCT_PRERELEASE_STRING =



ifdef PRODUCT_PRERELEASE