From 38abe9e64fd5f6a60f3fe1accf848ef06c194ca1 Mon Sep 17 00:00:00 2001 From: Vinay Sudra Date: Tue, 16 Mar 2021 13:49:59 +0530 Subject: [PATCH] Revert "Merge "Use environment variable to find unifdef tool for auto target"" This reverts commit 8a7d4fed84b97503c262e04b6e8b00d3ba82e70d, reversing changes made to bdf9093b7178c3191785a224bce17f1dbb2970c5. Change-Id: I6fbcfb72f49740223691f2e1edecbbfc28f420c5 Signed-off-by: Vinay Sudra --- gen_headers_arm64_auto.bp | 6 +----- gen_headers_arm_auto.bp | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gen_headers_arm64_auto.bp b/gen_headers_arm64_auto.bp index f63c31b8d3a2..38f867708186 100644 --- a/gen_headers_arm64_auto.bp +++ b/gen_headers_arm64_auto.bp @@ -1047,10 +1047,7 @@ genrule { genrule { name: "qti_generate_kernel_headers_arm64", - tools: [ - "headers_install.sh", - "unifdef", - ], + tools: ["headers_install.sh"], tool_files: [ "kernel_headers.py", ], @@ -1072,7 +1069,6 @@ 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 5dd2e0cdf017..6ac354adfdd5 100644 --- a/gen_headers_arm_auto.bp +++ b/gen_headers_arm_auto.bp @@ -1051,10 +1051,7 @@ genrule { genrule { name: "qti_generate_kernel_headers_arm", - tools: [ - "headers_install.sh", - "unifdef", - ], + tools: ["headers_install.sh"], tool_files: [ "kernel_headers.py", "arch/arm/tools/syscallhdr.sh", @@ -1079,7 +1076,6 @@ 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, }