LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gn2bp: Add get_srcs to the Sanitizer

Browse Source 
Test: ./update_results.sh
Change-Id: If6b24297727801d4f2a80000524e9a61d5976e97
This commit is contained in:
Motomu Utsumi
2022-12-05 12:50:57 +09:00
parent 047831e03a
commit 80fa0b0e8d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/gn2bp/gen_android_bp
View File

@@ -749,6 +749,13 @@ class BaseActionSanitizer():
def get_inputs(self): def get_inputs(self):
return self.target.inputs return self.target.inputs
def get_srcs(self):
# gn treats inputs and sources for actions equally.
# soong only supports source files inside srcs, non-source files are added as
# tool_files dependency.
files = self.target.sources.union(self.target.inputs)
return {gn_utils.label_to_path(file) for file in files if is_supported_source_file(file)}
def _sanitize_args(self): def _sanitize_args(self):
# Handle passing parameters via response file by piping them into the script # Handle passing parameters via response file by piping them into the script
# and reading them from /dev/stdin. # and reading them from /dev/stdin.
@@ -938,6 +945,7 @@ def create_action_module(blueprint, target, type):
if sanitizer.is_header_generated(): if sanitizer.is_header_generated():
module.genrule_headers.add(module.name) module.genrule_headers.add(module.name)
target.inputs = sanitizer.get_inputs() target.inputs = sanitizer.get_inputs()
module.srcs = sanitizer.get_srcs()
if target.script == '//base/android/jni_generator/jni_generator.py': if target.script == '//base/android/jni_generator/jni_generator.py':
# android_jar.classes should be part of the tools as it list implicit classes # android_jar.classes should be part of the tools as it list implicit classes
@@ -960,9 +968,7 @@ def create_action_module(blueprint, target, type):
# soong only supports source files inside srcs, non-source files are added as # soong only supports source files inside srcs, non-source files are added as
# tool_files dependency. # tool_files dependency.
for it in target.sources.union(target.inputs): for it in target.sources.union(target.inputs):
if is_supported_source_file(it): if not is_supported_source_file(it):
module.srcs.add(gn_utils.label_to_path(it))
else:
module.tool_files.add(gn_utils.label_to_path(it)) module.tool_files.add(gn_utils.label_to_path(it))
blueprint.add_module(module) blueprint.add_module(module)