commit 7c0f098a073f5972668872fd6579963e206bd5f8
author Mohannad Farrag <aymanm@google.com> Thu Nov 10 14:39:49 2022 +0000
committer Patrick Rohr <prohr@google.com> Thu Nov 10 19:29:03 2022 +0000
tree 5e0e9ff9eb5259da0da901ffb2af653cf2a1a2c5
parent c5144187fd5d8c6008740f79ed947096c8797951

gn2bp: Fix jni_registration for cronet

* I've verified that the generated files are completely identical to each other including the define flags.

Test: m cronet_aml_components_cronet_android_cronet_jni_registration
Change-Id: I1582be0ee340d422c21ae9332509824c6e7d5a6f

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 228ac68..34a9f49 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -1982,7 +1982,7 @@
          "--manual_jni_registration " +
          " " +
          " " +
-         ";sed -i -e 's/OUT_SOONG_.TEMP/OUT_SOONG_DOTTEMP/g'  " +
+         ";sed -i -e 's/OUT_SOONG_.TEMP_SBOX_.*_OUT/GEN/g'  " +
          "$(genDir)/components/cronet/android/cronet_jni_registration.h",
     out: [
         "components/cronet/android/cronet_jni_registration.h",

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 46b461b..0ca97c6 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1008,7 +1008,7 @@
 
     # .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(";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)