commit 26bbae99189a64cf3bd10cc7b69d319c7a1cc8d2
author Mohannad Farrag <aymanm@google.com> Mon Nov 07 16:51:23 2022 +0000
committer Mohannad Farrag <aymanm@google.com> Mon Nov 07 18:20:13 2022 +0000
tree 5db6fc1f5e16f917eee4bb5d6b76dbf42e41661f
parent 033c9d6d858082ff7e9dbf5ab51379d89ba466a7

gn2bp: Fix incorrect aprotoc command

* dllexport_decl sometimes used brackets in its value which isn't allowed in a bash command. This fix adds apostrophe around the value.

Test: m cronet_aml_net_net
Change-Id: Ic78f0dee38eb6407ac61a709034967a3f77e730b

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 5fe039b..5d9da5e 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -3086,7 +3086,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
+         "dllexport_decl='NET_EXPORT_PRIVATE:' " +
          " " +
          "--include " +
          "$(location net/base/net_export.h) " +
@@ -3118,7 +3118,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
+         "dllexport_decl='NET_EXPORT_PRIVATE:' " +
          " " +
          "--include " +
          "$(location net/base/net_export.h) " +
@@ -3349,7 +3349,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=COMPONENT_EXPORT(QUICHE): " +
+         "dllexport_decl='COMPONENT_EXPORT(QUICHE):' " +
          " " +
          "--include " +
          "$(location base/component_export.h) " +
@@ -3387,7 +3387,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=COMPONENT_EXPORT(QUICHE): " +
+         "dllexport_decl='COMPONENT_EXPORT(QUICHE):' " +
          " " +
          "--include " +
          "$(location base/component_export.h) " +
@@ -3476,7 +3476,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
+         "dllexport_decl='NET_EXPORT_PRIVATE:' " +
          " " +
          "--include " +
          "$(location net/base/net_export.h) " +
@@ -3508,7 +3508,7 @@
          "--cc-out-dir " +
          "$(genDir) " +
          "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
+         "dllexport_decl='NET_EXPORT_PRIVATE:' " +
          " " +
          "--include " +
          "$(location net/base/net_export.h) " +

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 99f613f..7c85f2d 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -907,7 +907,7 @@
         target.args[i + 1] = '$(genDir)'
       elif val == 'dllexport_decl':
         # Needs to be dllexport_decl=value format
-        target.args[i] += '=' + target.args[i+1]
+        target.args[i] = '%s=\'%s\'' % (target.args[i], target.args[i + 1])
         target.args[i+1] = ''
       elif val == '--include':
         # This file can be got from filegroup this target depends on, but currently we don't add .h