Use environment variable to find unifdef tool
Tools used within the sandbox are now copied into the
sandbox, see aosp/1531944. This caused the modified
headers_install.sh, which is no longer installed, to
point to a non-existent location.
This change adds a level of indirection. The
gen-headers_install.sh module no longer uses unifdef as
a tool, but still modifies the headers_install.sh
script, but not to point to a particular location, but
to find the unifdef tool via an environment variable,
LOC_UNIFDEF.
Next, we modify qti_generate_kernel_headers_arm and
qti_generate_kernel_headers_arm64 to need the unifdef
tool (which is copied into the sandbox for these tools).
We add a new --unifdef option to the kernel_headers.py
script so that it can find the tool in the sandbox. The
kernel_headers.py script sets the LOC_UNIFDEF
environment variable before invoking the altered
headers_install.sh script (also copied into the
sandbox).
Finally, we generate gen_headers_arm.bp and
gen_headers_arm64.bp with all of these changes.
Bug: 178500203
Change-Id: Ie3b8c36b7d60bd950c28bac566e04f43de78cf98
Signed-off-by: Mohammed Athar <athar@codeaurora.org>
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
Signed-off-by: Eruvaram Kumar Raja Reddy <erajared@codeaurora.org>
diff --git a/gen_headers_arm64.bp b/gen_headers_arm64.bp
index dd22a35..746ca09 100644
--- a/gen_headers_arm64.bp
+++ b/gen_headers_arm64.bp
@@ -948,7 +948,10 @@
genrule {
name: "qti_generate_kernel_headers_arm64",
- tools: ["headers_install.sh"],
+ tools: [
+ "headers_install.sh",
+ "unifdef",
+ ],
tool_files: [
"kernel_headers.py",
],
@@ -969,6 +972,7 @@
"--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,
}