display: get unifdef explicitly
get unifdef explicitly when enabled with argument Change-Id: I9f12da913c7058279f14ecceedde3bfe64be9086 Signed-off-by: Naseer Ahmed <naseer@codeaurora.org> Signed-off-by: Abhijith Desai <abdesai@codeaurora.org>
This commit is contained in:
parent
025b38d4f8
commit
7f14a08b68
@ -13,7 +13,10 @@ display_headers_out = [
|
||||
display_kernel_headers_verbose = "--verbose "
|
||||
genrule {
|
||||
name: "qti_generate_display_kernel_headers",
|
||||
tools: ["headers_install.sh"],
|
||||
tools: [
|
||||
"headers_install.sh",
|
||||
"unifdef"
|
||||
],
|
||||
tool_files: [
|
||||
"display_kernel_headers.py",
|
||||
],
|
||||
@ -23,6 +26,7 @@ genrule {
|
||||
"--header_arch arm64 " +
|
||||
"--gen_dir $(genDir) " +
|
||||
"--display_include_uapi $(locations include/uapi/*/**/*.h) " +
|
||||
"--unifdef $(location unifdef) " +
|
||||
"--headers_install $(location headers_install.sh)",
|
||||
out: display_headers_out,
|
||||
}
|
||||
|
@ -18,31 +18,33 @@ import re
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
def run_headers_install(verbose, gen_dir, headers_install, prefix, h):
|
||||
def run_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):
|
||||
if not h.startswith(prefix):
|
||||
print('error: expected prefix [%s] on header [%s]' % (prefix, h))
|
||||
return False
|
||||
|
||||
out_h = os.path.join(gen_dir, h[len(prefix):])
|
||||
(out_h_dirname, out_h_basename) = os.path.split(out_h)
|
||||
env = os.environ.copy()
|
||||
env["LOC_UNIFDEF"] = unifdef
|
||||
cmd = ["sh", headers_install, h, out_h]
|
||||
|
||||
if verbose:
|
||||
print('run_headers_install: cmd is %s' % cmd)
|
||||
|
||||
result = subprocess.call(cmd)
|
||||
result = subprocess.call(cmd, env=env)
|
||||
|
||||
if result != 0:
|
||||
print('error: run_headers_install: cmd %s failed %d' % (cmd, result))
|
||||
return False
|
||||
return True
|
||||
|
||||
def gen_display_headers(verbose, gen_dir, headers_install, display_include_uapi):
|
||||
def gen_display_headers(verbose, gen_dir, headers_install, unifdef, display_include_uapi):
|
||||
error_count = 0
|
||||
for h in display_include_uapi:
|
||||
display_uapi_include_prefix = os.path.join(h.split('/include/uapi')[0], 'include', 'uapi') + os.sep
|
||||
if not run_headers_install(
|
||||
verbose, gen_dir, headers_install,
|
||||
verbose, gen_dir, headers_install, unifdef,
|
||||
display_uapi_include_prefix, h): error_count += 1
|
||||
return error_count
|
||||
|
||||
@ -68,6 +70,10 @@ def main():
|
||||
parser.add_argument(
|
||||
'--headers_install', required=True,
|
||||
help='The headers_install tool to process input headers.')
|
||||
parser.add_argument(
|
||||
'--unifdef',
|
||||
required=True,
|
||||
help='The unifdef tool used by headers_install.')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
@ -76,9 +82,10 @@ def main():
|
||||
print('gen_dir [%s]' % args.gen_dir)
|
||||
print('display_include_uapi [%s]' % args.display_include_uapi)
|
||||
print('headers_install [%s]' % args.headers_install)
|
||||
print('unifdef [%s]' % args.unifdef)
|
||||
|
||||
return gen_display_headers(args.verbose, args.gen_dir,
|
||||
args.headers_install, args.display_include_uapi)
|
||||
args.headers_install, args.unifdef, args.display_include_uapi)
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
|
Loading…
Reference in New Issue
Block a user