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

gn2bp: Add JniRegistrationGenerator get_cmd

Browse Source 
* jni_registration_generator action has extra cmds that needs to be appeneded to the original cmd like generation of the java files.
* Moved `NEWLINE` to the top of the file.

Test: update_results.sh
Change-Id: I92cec28786472ef31b514698422e100885714250
This commit is contained in:
Mohannad Farrag
2022-12-02 15:49:00 +00:00
parent c739dda3f1
commit 291f567f86
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/gn2bp/gen_android_bp
View File

@@ -812,6 +812,26 @@ class JniRegistrationGeneratorSanitizer(BaseActionSanitizer):
self._delete_value_arg('--sources-exclusions') self._delete_value_arg('--sources-exclusions')
super()._sanitize_args() super()._sanitize_args()
def get_cmd(self):
# jni_registration_generator.py doesn't work with python2
cmd = "python3 " + super().get_cmd()
# Path in the original sources file does not work in genrule.
# So creating sources file in cmd based on the srcs of this target.
# Adding ../$(current_dir)/ to the head because jni_registration_generator.py uses the files
# whose path startswith(..)
commands = ["current_dir=`basename \\\`pwd\\\``;",
"for f in $(in);",
"do",
"echo \\\"../$$current_dir/$$f\\\" >> $(genDir)/java.sources;",
"done;",
cmd]
# .h file jni_registration_generator.py generates has #define with directory name.
# With the genrule env that contains "." which is invalid. So replace that at the end of cmd.
commands.append(";sed -i -e 's/OUT_SOONG_.TEMP_SBOX_.*_OUT/GEN/g' ")
commands.append("$(genDir)/components/cronet/android/cronet_jni_registration.h")
return NEWLINE.join(commands)
class VersionSanitizer(BaseActionSanitizer): class VersionSanitizer(BaseActionSanitizer):
def _sanitize_args(self): def _sanitize_args(self):
self._set_value_arg('-o', '$(out)') self._set_value_arg('-o', '$(out)')
@@ -925,26 +945,6 @@ def create_action_module(blueprint, target, type):
else: else:
module.tool_files.add(gn_utils.label_to_path(it)) module.tool_files.add(gn_utils.label_to_path(it))
if target.script == '//base/android/jni_generator/jni_registration_generator.py':
# jni_registration_generator.py doesn't work with python2
module.cmd = "python3 " + module.cmd
# Path in the original sources file does not work in genrule.
# So creating sources file in cmd based on the srcs of this target.
# Adding ../$(current_dir)/ to the head because jni_registration_generator.py uses the files
# whose path startswith(..)
commands = ["current_dir=`basename \\\`pwd\\\``;",
"for f in $(in);",
"do",
"echo \\\"../$$current_dir/$$f\\\" >> $(genDir)/java.sources;",
"done;",
module.cmd]
# .h file jni_registration_generator.py generates has #define with directory name.
# With the genrule env that contains "." which is invalid. So replace that at the end of cmd.
commands.append(";sed -i -e 's/OUT_SOONG_.TEMP_SBOX_.*_OUT/GEN/g' ")
commands.append("$(genDir)/components/cronet/android/cronet_jni_registration.h")
module.cmd = NEWLINE.join(commands)
blueprint.add_module(module) blueprint.add_module(module)
return module return module