OnePlusOSS
diff --git a/‎kernel_platform/build/kernel/android/merge_dtbs.py‎
Lines changed: 21 additions & 1 deletion b/‎kernel_platform/build/kernel/android/merge_dtbs.py‎
Lines changed: 21 additions & 1 deletion
diff --git a/‎kernel_platform/build/kernel/android/prepare_vendor.sh‎
Lines changed: 8 additions & 1 deletion b/‎kernel_platform/build/kernel/android/prepare_vendor.sh‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎kernel_platform/build/kernel/kleaf/impl/kernel_build.bzl‎
Lines changed: 0 additions & 18 deletions b/‎kernel_platform/build/kernel/kleaf/impl/kernel_build.bzl‎
Lines changed: 0 additions & 18 deletions
diff --git a/‎kernel_platform/build/kernel/kleaf/impl/kernel_env.bzl‎
Lines changed: 13 additions & 0 deletions b/‎kernel_platform/build/kernel/kleaf/impl/kernel_env.bzl‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎kernel_platform/oplus/bazel/oplus_modules.bzl‎
Lines changed: 4 additions & 0 deletions b/‎kernel_platform/oplus/bazel/oplus_modules.bzl‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎kernel_platform/oplus/config/modules.vendor_boot.list.oplus‎
Lines changed: 4 additions & 0 deletions b/‎kernel_platform/oplus/config/modules.vendor_boot.list.oplus‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎kernel_platform/oplus/tools/abi_gki_oki_check.py‎
Lines changed: 32 additions & 5 deletions b/‎kernel_platform/oplus/tools/abi_gki_oki_check.py‎
Lines changed: 32 additions & 5 deletions
diff --git a/‎kernel_platform/oplus/tools/bpftool‎
3.18 MB b/‎kernel_platform/oplus/tools/bpftool‎
3.18 MB
diff --git a/‎kernel_platform/oplus/tools/common.py‎
Lines changed: 22 additions & 0 deletions b/‎kernel_platform/oplus/tools/common.py‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎kernel_platform/qcom/opensource/devicetree/oplus/Makefile‎
Lines changed: 2 additions & 1 deletion b/‎kernel_platform/qcom/opensource/devicetree/oplus/Makefile‎
Lines changed: 2 additions & 1 deletion
@@ -498,7 +498,19 @@ def apply_overlay_check(base, dtbo):
 	if dtbo > base:
 		cmd = ['ufdt_apply_overlay', base.filename, dtbo.filename, '/dev/null']
 		logging.debug(' '.join(cmd))
-		subprocess.run(cmd, check=True)
+		try:
+			subprocess.run(cmd, check=True, capture_output=True, text=True)
+		except subprocess.CalledProcessError as e:
+			# Re-raise with more context
+			raise RuntimeError(
+				'Failed to apply overlay {} to {}: {}\nCommand: {}\nStderr: {}'.format(
+					dtbo.filename, base.filename, e, ' '.join(cmd), e.stderr
+				)
+			) from e
+		except FileNotFoundError:
+			raise RuntimeError(
+				'ufdt_apply_overlay command not found. Please ensure it is installed and in PATH.'
+			)
 	else:
 		return
 
@@ -568,6 +580,14 @@ def main():
 			futures[future] = (base, dtbo, idx + 1)
 		for future in as_completed(futures):
 			base, dtbo, task_id = futures[future]
+			try:
+				future.result()  # This will raise any exception that occurred
+				logging.debug('Overlay check {}/{} passed: {} -> {}'.format(
+					task_id, total_checks, base.filename, dtbo.filename))
+			except Exception as e:
+				logging.error('Overlay check {}/{} failed: {} -> {}: {}'.format(
+					task_id, total_checks, base.filename, dtbo.filename, str(e)))
+				raise e
 
 if __name__ == "__main__":
 	main()
@@ -551,7 +551,9 @@ if [ -n "${ANDROID_PRODUCT_OUT}" ] && [ -n "${ANDROID_BUILD_TOP}" ]; then
   # goes through w/o any issues.
   if [ -d "${ANDROID_BUILD_TOP}/bazel-cache" ]; then
     chmod -R 0777 "${ANDROID_BUILD_TOP}/bazel-cache"
-    find "${ANDROID_BUILD_TOP}/bazel-cache" \( -name Android.mk -o -name Android.bp \) -delete
+    #ifdef OPLUS_EDIT
+    find "${ANDROID_BUILD_TOP}/bazel-cache" -maxdepth 4 \( -name "*.mk" -o -name Android.bp \) -delete
+    #end
   fi
 
   if [ -d "${ROOT_DIR}/bazel-cache" ]; then
@@ -664,6 +666,11 @@ fi
 # remove bazel dir to avoid build issues
 rm -rf ${ANDROID_BUILD_TOP}/kernel_platform/out/bazel
 
+if [ -f ${ANDROID_KP_OUT_DIR}/dist/vmlinux_oki ]; then
+    mv ${ANDROID_KP_OUT_DIR}/dist/vmlinux ${ANDROID_KP_OUT_DIR}/dist/vmlinux_gki
+    mv ${ANDROID_KP_OUT_DIR}/dist/vmlinux_oki ${ANDROID_KP_OUT_DIR}/dist/vmlinux
+fi
+
 if [ ! -d "${ANDROID_BUILD_TOP}/out" ];then
     mkdir -p ${ANDROID_BUILD_TOP}/out
 fi
 
@@ -1167,20 +1167,6 @@ def _create_kbuild_mixed_tree_legacy(ctx):
     kbuild_mixed_tree = ctx.actions.declare_directory("{}_kbuild_mixed_tree".format(ctx.label.name))
     returned_inputs = depset([kbuild_mixed_tree])
     base_kernel_files = base_kernel_utils.get_base_kernel(ctx)[KernelBuildMixedTreeInfo].files
-    gki_restore_cmd = ""
-    gki_path = ctx.configuration.default_shell_env.get("PREBUILT_BOOTIMAGE_PATH", "")
-    prebuilt_bootimage = ctx.configuration.default_shell_env.get("OPLUS_USE_PREBUILT_BOOTIMAGE", "")
-    target_build_variant = ctx.configuration.default_shell_env.get("TARGET_BUILD_VARIANT", "")
-    if prebuilt_bootimage not in ("ogki", "no" , "oki") and target_build_variant != "userdebug":
-        gki_restore_cmd = """
-            input="$(realpath ${KBUILD_MIXED_TREE})"
-            root_dir=$(echo "$input" | sed -n 's|\\(.*source/vnd\\).*|\\1|p')
-            vmlinux_src=$(realpath "${root_dir}/${gki_path}")
-            vmlinux_dest="${KBUILD_MIXED_TREE}/vmlinux"
-            if [ -f ${vmlinux_src} ]; then
-                cp -f "$(readlink -m "$vmlinux_src")" "$vmlinux_dest"
-            fi
-        """
     kbuild_mixed_tree_command = hermetic_tools.setup + """
         # Restore GKI artifacts for mixed build
         export KBUILD_MIXED_TREE=$(realpath {kbuild_mixed_tree})
@@ -1189,14 +1175,10 @@ def _create_kbuild_mixed_tree_legacy(ctx):
         for base_kernel_file in {base_kernel_files}; do
             cp -a -t ${{KBUILD_MIXED_TREE}} $(readlink -m ${{base_kernel_file}})
         done
-        gki_path={gki_path}
-        {gki_restore_cmd}
     """.format(
         # This to_list() is acceptable because GKI's outs/module_outs is a small list
         base_kernel_files = " ".join([file.path for file in base_kernel_files.to_list()]),
         kbuild_mixed_tree = kbuild_mixed_tree.path,
-        gki_restore_cmd = gki_restore_cmd,
-        gki_path = gki_path,
     )
     debug.print_scripts(ctx, kbuild_mixed_tree_command, what = "kbuild_mixed_tree")
     ctx.actions.run_shell(
 
@@ -162,6 +162,8 @@ def _get_build_config_inputs_impl(_subrule_ctx, *, srcs, build_config):
 _get_build_config_inputs = subrule(implementation = _get_build_config_inputs_impl)
 
 def _kernel_env_impl(ctx):
+    prebuilt_bootimage = ctx.configuration.default_shell_env.get("OPLUS_USE_PREBUILT_BOOTIMAGE", "")
+    target_build_variant = ctx.configuration.default_shell_env.get("TARGET_BUILD_VARIANT", "")
     kconfig_ext = ctx.file.kconfig_ext
     dtstree_makefile = None
     dtstree_srcs = depset()
@@ -200,6 +202,17 @@ def _kernel_env_impl(ctx):
             """.format(
             kconfig_ext = kconfig_ext.path,
         )
+
+    if prebuilt_bootimage:
+        command += """
+              export OPLUS_USE_PREBUILT_BOOTIMAGE={prebuilt_bootimage}
+            """.format(prebuilt_bootimage=prebuilt_bootimage)
+
+    if target_build_variant:
+        command += """
+              export TARGET_BUILD_VARIANT={target_build_variant}
+            """.format(target_build_variant=target_build_variant)
+
     if dtstree_makefile:
         command += """
               export DTSTREE_MAKEFILE={dtstree}
 
@@ -111,6 +111,7 @@ def define_oplus_ddk_modules(target, msm_target, variant):
         "//vendor/oplus/kernel/storage:storage_log",
         "//vendor/oplus/kernel/storage:ufs-oplus-dbg",
         "//vendor/oplus/kernel/storage:oplus_file_record",
+        "//vendor/oplus/kernel/storage/oplus_overlayfs:oplus_overlay",
         "//vendor/oplus/kernel/synchronize:oplus_lock_torture",
         "//vendor/oplus/kernel/synchronize:oplus_locking_strategy",
         "//vendor/oplus/kernel/touchpanel/kernelFwUpdate/bazel:oplus_bsp_fw_update",
@@ -155,6 +156,9 @@ def define_oplus_ddk_modules(target, msm_target, variant):
         "//vendor/oplus/sensor/kernel/qcom:oplus_sensor_interact",
         "//vendor/oplus/sensor/kernel/qcom:oplus_sensor_ir_core",
         "//vendor/oplus/sensor/kernel/qcom:oplus_sensor_kookong_ir_spi",
+        "//vendor/oplus/kernel/nfc:oplus_nfc",
+        "//vendor/oplus/kernel/nfc:oplus_network_nfc_thn31",
+        "//vendor/oplus/kernel/patch:oplus_patch",
     ]
 
     #conditional_build modules
 
@@ -22,3 +22,7 @@ cpufreq_bouncing.ko
 oplus_bsp_task_overload.ko
 oplus_mdmfeature.ko
 oplus_wq_dynamic_priority.ko
+oplus_bsp_bootmode.ko
+oplus_ftm_mode.ko
+oplusboot.ko
+oplus_charger_present.ko
@@ -28,6 +28,14 @@ def generate_ack_abi(args, ack, output_dir):
     return process, generate_abi_aarch64_oplus
 
 
+def check_btf_data(args, ack, vmlinux, output_dir):
+    btf_h = "{}/btf_{}.h".format(output_dir, ack)
+    btf_h_command = "{} btf dump file {} format c > {}".format(args.bpftool, vmlinux, btf_h)
+    process = subprocess.Popen(btf_h_command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    print("btf_h_command {}".format(btf_h_command))
+    return process, btf_h_command
+
+
 def dump_modversions(ack_path, ko_modversions_full):
     ko_files = find_ko_files(ack_path)
     command = "modprobe --dump-modversions {} *.ko to {}".format(ack_path, ko_modversions_full)
@@ -54,6 +62,8 @@ def generate_abis_modversions(args, acks, output_dir):
         if os.path.exists(ack_vmlinux):
             process, command = generate_ack_abi(args, ack, ack_path)
             processes.append((process, command))
+            process, command = check_btf_data(args, ack, ack_vmlinux, ack_path)
+            processes.append((process, command))
 
         process, command = dump_modversions(ack_path, ko_modversions_full)
         processes.append((process, command))
@@ -165,15 +175,18 @@ def compare_same_line_files(base_file, new_file, output_file):
         print("error", exc)
 
 
-def copy_log_files_to_dest(src, dest, exclude_patterns=None):
+def copy_log_files_to_dest(src=None, dest=None, exclude_patterns=None):
     print("Copy build log from {} to {} exclude{}".format(src, dest, exclude_patterns))
     print("You can find log in {} or in {} ".format(src, dest))
     print("For more information, please refer to the documentation link:")
     print("检查是否缺少符号,检查是否破坏KMI,检查是否能够进入recovery\n如需帮助,请阅读如下指导文档:")
     print("")
 
+    if src is None or dest is None:
+        return
+
     if not os.path.exists(src):
-        raise ValueError("src dir {} not exists".format(src))
+        return
 
     if not os.path.exists(dest):
         os.makedirs(dest)
@@ -408,7 +421,7 @@ def parse_cmd_args():
     parser.add_argument('--full_kernel_version', type=str, help='linux kernel full version', default="")
     parser.add_argument('--vendor', type=str, help='vendor', default="qcom")
     parser.add_argument('--extract_symbols', type=str, help='extract_symbols', default="")
-
+    parser.add_argument('-b', '--bpftool', type=str, help='bpftool', default=get_resource_path('bpftool'))
     parser.add_argument('-z', '--lz4', type=str, help='lz4 process tool', default=get_resource_path('lz4'))
     parser.add_argument('-n', '--unpack_bootimg', type=str, help='boot unpack tool',
                         default=get_resource_path('unpack_bootimg'))
@@ -701,11 +714,13 @@ def ddk_ko_check(args, output_dir):
     print("\nddk ko check end...")
 
 def symbols_crc_check(acks, output_dir):
+    btf_hashs = []
     for ack in acks:
         print("\ngenerate {} ko modversions".format(ack))
         ack_path = str(pathlib.Path(output_dir) / ack)
         ack_log = str(pathlib.Path(log_dir) / ack)
         ack_vmlinux = str(pathlib.Path(ack_path) / 'vmlinux')
+        btf_h = "{}/{}/btf_{}.h".format(output_dir, ack, ack)
 
         if not os.path.exists(ack_vmlinux):
             print("path:{} not exist ignore".format(ack_vmlinux))
@@ -752,11 +767,23 @@ def symbols_crc_check(acks, output_dir):
 
         print("check {} ko modversions".format(ack))
         compare_symbols_modversions(ko_modversions_remove_spaces, modversions_duplicates_sort, symvers_ko_result)
-        check_current_status(symvers_ko_result, ack_path, ack_log, exclude_file, False)
-
+        check_current_status(symvers_ko_result, ack_path, ack_log, exclude_file)
+        btf_hash = common.calculate_file_md5(btf_h)
+        btf_hashs.append(btf_hash)
         print("copy log to dest...")
         copy_log_files_to_dest(ack_path, ack_log, exclude_file)
 
+    unique_hashes = set(btf_hashs)
+    if len(unique_hashes) > 1:
+        print("check btf fail,you can check log in out/oplus/*ki/btf_*ki.h or LOGDIR/abi/*ki/btf_*ki.h \n"
+              "please check the md5 of btf_*ki.h is same or not.")
+        for btf_hash in unique_hashes:
+            print("btf_hash: {}\n".format(btf_hash))
+        copy_log_files_to_dest()
+    else:
+        print("check btf success...")
+
+
 
 def find_numeric_modules_filter(directory):
     numeric_suffixes = []
 
@@ -1,4 +1,5 @@
 import gzip
+import hashlib
 import shutil
 import os
 import subprocess
@@ -813,3 +814,24 @@ def upload_files_to_server(user, password, local_dir, paths, remote_address):
         else:
             print("prebuilt mode")
             upload_file(local_path, remote_path)
+
+def calculate_file_md5(file_path):
+    """
+    Calculate the MD5 value of a single file.
+
+    :param file_path: Path to the file
+    :return: MD5 value of the file as a string. Returns None if the file does not exist or
+    an error occurs while reading.
+    """
+    if not os.path.isfile(file_path):
+        return None
+
+    try:
+        md5 = hashlib.md5()
+        with open(file_path, 'rb') as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                md5.update(chunk)
+        return md5.hexdigest()
+    except Exception as e:
+        print("Error reading file {}: {}".format(file_path, e))
+        return None
@@ -1,4 +1,5 @@
-CANOE_BASE_DTB += ../qcom/canoe.dtb ../qcom/canoe-v2.dtb ../qcom/canoe-tp.dtb ../qcom/canoe-tp-v2.dtb
+CANOE_BASE_DTB += ../qcom/canoe.dtb ../qcom/canoe-v2.dtb ../qcom/canoe-tp.dtb ../qcom/canoe-tp-v2.dtb ../qcom/alor.dtb \
+	../qcom/alor-interposer.dtb ../qcom/alor-interposer-v2.dtb ../qcom/alorp.dtb
 CANOE_APQ_BASE_DTB += ../qcom/canoep.dtb ../qcom/canoep-v2.dtb ../qcom/canoep-tp.dtb ../qcom/canoep-tp-v2.dtb
 
 CANOE_BOARDS += \