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

gn2bp: Replace invalid #define for jni_registration_generator.py

Browse Source 
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Ie73be657a9ffec86a554ce793f7ca390ce3775a2
This commit is contained in:
Motomu Utsumi
2022-11-10 18:03:20 +09:00
parent 79bd0c87c5
commit 2a892d2eb8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gn2bp/Android.bp.swp
View File

@@ -1981,7 +1981,9 @@ genrule {
"$(genDir)/components/cronet/android/cronet_jni_registration.h " + "$(genDir)/components/cronet/android/cronet_jni_registration.h " +
"--manual_jni_registration " + "--manual_jni_registration " +
" " + " " +
"", " " +
";sed -i -e 's/OUT_SOONG_.TEMP/OUT_SOONG_DOTTEMP/g' " +
"$(genDir)/components/cronet/android/cronet_jni_registration.h",
out: [ out: [
"components/cronet/android/cronet_jni_registration.h", "components/cronet/android/cronet_jni_registration.h",
"components/cronet/android/cronet_jni_registration.srcjar", "components/cronet/android/cronet_jni_registration.srcjar",

5
tools/gn2bp/gen_android_bp
View File

@@ -1005,6 +1005,11 @@ def create_action_module(blueprint, target):
"echo \\\"../$$current_dir/$$f\\\" >> $(genDir)/java.sources;", "echo \\\"../$$current_dir/$$f\\\" >> $(genDir)/java.sources;",
"done;", "done;",
module.cmd] 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/OUT_SOONG_DOTTEMP/g' ")
commands.append("$(genDir)/components/cronet/android/cronet_jni_registration.h")
module.cmd = NEWLINE.join(commands) module.cmd = NEWLINE.join(commands)
blueprint.add_module(module) blueprint.add_module(module)