commit 6ccc9d8b1c799aa357188b28d8937f707337ec36
author Motomu Utsumi <motomuman@google.com> Wed Nov 16 18:05:45 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Wed Nov 16 20:06:03 2022 +0900
tree abd8f5499b3541471333f79786fbf8d272dabcc7
parent d58c1dc8d4deeb53d8d2ac55b8b448e3c72534d8

gn2bp: Fix to bubble up proto static_lib deps

Test: ./update_results.sh
Change-Id: I98d484b3d6c467248f7a05cb25576d48a75ce228

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 6ecc865..8fab845 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2072,6 +2072,9 @@
         "cronet_aml_third_party_icu_icuuc_private",
         "cronet_aml_third_party_libevent_libevent",
         "cronet_aml_third_party_modp_b64_modp_b64",
+        "cronet_aml_third_party_protobuf_protobuf_full",
+        "cronet_aml_third_party_protobuf_protobuf_lite",
+        "cronet_aml_third_party_protobuf_protoc_lib",
         "cronet_aml_third_party_zlib_zlib",
         "cronet_aml_url_url",
     ],
@@ -3479,7 +3482,9 @@
         "cronet_aml_third_party_icu_icuuc_private",
         "cronet_aml_third_party_libevent_libevent",
         "cronet_aml_third_party_modp_b64_modp_b64",
+        "cronet_aml_third_party_protobuf_protobuf_full",
         "cronet_aml_third_party_protobuf_protobuf_lite",
+        "cronet_aml_third_party_protobuf_protoc_lib",
         "cronet_aml_third_party_zlib_zlib",
         "cronet_aml_url_url",
     ],
@@ -4261,7 +4266,9 @@
         "cronet_aml_third_party_icu_icuuc_private",
         "cronet_aml_third_party_libevent_libevent",
         "cronet_aml_third_party_modp_b64_modp_b64",
+        "cronet_aml_third_party_protobuf_protobuf_full",
         "cronet_aml_third_party_protobuf_protobuf_lite",
+        "cronet_aml_third_party_protobuf_protoc_lib",
         "cronet_aml_third_party_zlib_zlib",
         "cronet_aml_url_url",
     ],
@@ -6921,6 +6928,7 @@
         "third_party/protobuf/src/google/protobuf/compiler/main.cc",
     ],
     static_libs: [
+        "cronet_aml_third_party_protobuf_protobuf_full",
         "cronet_aml_third_party_protobuf_protoc_lib",
         "cronet_aml_third_party_zlib_zlib",
     ],

tools/gn2bp/gn_utils.py

diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index a2d90e4..31cc2e1 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -351,9 +351,7 @@
       if dep.type == 'static_library':
         # Bubble up static_libs. Necessary, since soong does not propagate
         # static_libs up the build tree.
-        # Protobuf dependencies are handled separately.
-        if '//third_party/protobuf' not in dep_name:
-          target.transitive_static_libs_deps.add(dep_name)
+        target.transitive_static_libs_deps.add(dep_name)
 
       target.transitive_static_libs_deps.update(dep.transitive_static_libs_deps)
       target.deps.update(target.transitive_static_libs_deps)