gn2bp: Fix dllexport_decl arg in protoc_wrapper.py
Test: ./update_result.sh
Change-Id: I4ef58164fa4011b5756e37b779ef64fea56a1029
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 0a9784e..f679a09 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -4215,8 +4215,8 @@
"--cc-out-dir " +
"$(genDir)/net/nqe/proto " +
"--cc-options " +
- "dllexport_decl " +
- "NET_EXPORT_PRIVATE: " +
+ "dllexport_decl=NET_EXPORT_PRIVATE: " +
+ " " +
"--include " +
"net/base/net_export.h " +
"--py-out-dir " +
@@ -4441,8 +4441,8 @@
"--cc-out-dir " +
"$(genDir)/net/third_party/quiche/src " +
"--cc-options " +
- "dllexport_decl " +
- "COMPONENT_EXPORT(QUICHE): " +
+ "dllexport_decl=COMPONENT_EXPORT(QUICHE): " +
+ " " +
"--include " +
"base/component_export.h " +
"--py-out-dir " +
@@ -4529,8 +4529,8 @@
"--cc-out-dir " +
"$(genDir)/net/third_party/quiche/src/quiche/quic/test_tools " +
"--cc-options " +
- "dllexport_decl " +
- "NET_EXPORT_PRIVATE: " +
+ "dllexport_decl=NET_EXPORT_PRIVATE: " +
+ " " +
"--include " +
"net/base/net_export.h " +
"--py-out-dir " +
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index a0cdb6c..ac629ba 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -873,6 +873,10 @@
target.args[i + 1] += '/../../../../'
elif val == '--cc-out-dir':
target.args[i + 1] = re.sub('^gen', '$(genDir)', target.args[i + 1])
+ elif val == 'dllexport_decl':
+ # Needs to be dllexport_decl=value format
+ target.args[i] += '=' + target.args[i+1]
+ target.args[i+1] = ''
script = gn_utils.label_to_path(target.script)
module.tool_files.add(script)