From c80b58390d286bba7d088b7653f515336f5f0729 Mon Sep 17 00:00:00 2001 From: Vinay Sudra Date: Thu, 1 Apr 2021 09:43:37 +0530 Subject: [PATCH] Use environment variable to find unifdef tool for auto target Add --unifdef option to gen_headers_arm_auto.bp and gen_headers_arm64.bp. Change-Id: I0e1aaaef7004e3133ba45224918bf8b6ea3a5e7e Signed-off-by: Vinay Sudra --- gen_headers_arm64_auto.bp | 6 +++++- gen_headers_arm_auto.bp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gen_headers_arm64_auto.bp b/gen_headers_arm64_auto.bp index 38f867708186..f63c31b8d3a2 100644 --- a/gen_headers_arm64_auto.bp +++ b/gen_headers_arm64_auto.bp @@ -1047,7 +1047,10 @@ genrule { genrule { name: "qti_generate_kernel_headers_arm64", - tools: ["headers_install.sh"], + tools: [ + "headers_install.sh", + "unifdef", + ], tool_files: [ "kernel_headers.py", ], @@ -1069,6 +1072,7 @@ genrule { "--new_gen_headers_bp $(location :qti_generate_gen_headers_arm64) " + "--version_makefile $(location Makefile) " + "--headers_install $(location headers_install.sh) " + + "--unifdef $(location unifdef) " + "--include_uapi $(locations include/uapi/**/*.h)", out: ["linux/version.h"] + gen_headers_out_arm64, } diff --git a/gen_headers_arm_auto.bp b/gen_headers_arm_auto.bp index 6ac354adfdd5..5dd2e0cdf017 100644 --- a/gen_headers_arm_auto.bp +++ b/gen_headers_arm_auto.bp @@ -1051,7 +1051,10 @@ genrule { genrule { name: "qti_generate_kernel_headers_arm", - tools: ["headers_install.sh"], + tools: [ + "headers_install.sh", + "unifdef", + ], tool_files: [ "kernel_headers.py", "arch/arm/tools/syscallhdr.sh", @@ -1076,6 +1079,7 @@ genrule { "--arch_syscall_tool $(location arch/arm/tools/syscallhdr.sh) " + "--arch_syscall_tbl $(location arch/arm/tools/syscall.tbl) " + "--headers_install $(location headers_install.sh) " + + "--unifdef $(location unifdef) " + "--include_uapi $(locations include/uapi/**/*.h)", out: ["linux/version.h"] + gen_headers_out_arm, }