commit 2a892d2eb8f2723ba70a0832328a6c6599a94da7
author Motomu Utsumi <motomuman@google.com> Thu Nov 10 18:03:20 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Thu Nov 10 19:56:24 2022 +0900
tree f3377e41bbd5517ce2d68b650140a61b9a25daa2
parent 79bd0c87c540cbdd321289271076cbf9429fe7e2

gn2bp: Replace invalid #define for jni_registration_generator.py

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Ie73be657a9ffec86a554ce793f7ca390ce3775a2

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 77debfe..228ac68 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -1981,7 +1981,9 @@
          "$(genDir)/components/cronet/android/cronet_jni_registration.h " +
          "--manual_jni_registration " +
          " " +
-         "",
+         " " +
+         ";sed -i -e 's/OUT_SOONG_.TEMP/OUT_SOONG_DOTTEMP/g'  " +
+         "$(genDir)/components/cronet/android/cronet_jni_registration.h",
     out: [
         "components/cronet/android/cronet_jni_registration.h",
         "components/cronet/android/cronet_jni_registration.srcjar",

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 17b5bef..46b461b 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1005,6 +1005,11 @@
                 "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/OUT_SOONG_DOTTEMP/g' ")
+    commands.append("$(genDir)/components/cronet/android/cronet_jni_registration.h")
     module.cmd = NEWLINE.join(commands)
 
   blueprint.add_module(module)