gn2bp: use android proto library
Only add shared_libs to linker unit targets; proto genrules also include
a libprotobuf dependency.
Test: //net:net
Change-Id: I1e00ab74383c9bd0e71b2435e9cf3724318f8434
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index db2691d..539817b 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -119,12 +119,13 @@
elif module.host_supported:
module.host.static_libs.add('libprotobuf-cpp-full')
module.android.shared_libs.add('libprotobuf-cpp-full')
- else:
+ elif module.type not in ['genrule', 'filegroup']:
module.shared_libs.add('libprotobuf-cpp-full')
def enable_protobuf_lite(module):
- module.shared_libs.add('libprotobuf-cpp-lite')
+ if module.type not in ['genrule', 'filegroup']:
+ module.shared_libs.add('libprotobuf-cpp-lite')
def enable_protoc_lib(module):
@@ -199,18 +200,10 @@
lambda x: None,
'//gn:gtest_main':
lambda x: None,
- '//gn:protoc':
- lambda x: None,
'//gn:gtest_and_gmock':
enable_gtest_and_gmock,
'//gn:libunwind':
enable_libunwind,
- '//gn:protobuf_full':
- enable_protobuf_full,
- '//gn:protobuf_lite':
- enable_protobuf_lite,
- '//gn:protoc_lib':
- enable_protoc_lib,
'//gn:libunwindstack':
enable_libunwindstack,
'//gn:sqlite':
@@ -223,6 +216,12 @@
enable_bionic_libc_platform_headers_on_android,
'//third_party/protobuf:protoc':
lambda x: None,
+ '//third_party/protobuf:protobuf_full':
+ enable_protobuf_full,
+ '//third_party/protobuf:protobuf_lite':
+ enable_protobuf_lite,
+ '//third_party/protobuf:protoc_lib':
+ enable_protoc_lib,
}
# ----------------------------------------------------------------------------