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

Commit 80e00c22 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 790f1e02 3796cc0c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
CLANG_VERSION=$(build/soong/scripts/get_clang_version.py)
CLANG_VERSION=$(${ANDROID_BUILD_TOP}/build/soong/scripts/get_clang_version.py)
export LLVM_AOSP_PREBUILTS_VERSION="${CLANG_VERSION}"

# check to see if the supplied product is one we can build
+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ readonly aosp_tag_match=android-15.0 # For update-device-vars.sh
readonly os_branch=lineage-22.2
readonly device_branch=lineage-22.2

readonly prev_common_aosp_tag=android-security-15.0.0_r10 # September 2025, Security
readonly common_aosp_tag=android-security-15.0.0_r11 # November 2025, Security
readonly prev_common_aosp_tag=android-security-15.0.0_r11 # November 2025, Security
readonly common_aosp_tag=android-security-15.0.0_r12 # December 2025, Security

readonly common_aosp_build_id=BP1A.250505.005 # May 2025, Pixel 6, Tablet, 9

readonly topic=V_asb_2025-11
readonly topic=V_asb_2025-12

readonly merge_method="merge"