LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gn2bp: Remove third_party protobuf from builtin_deps

Browse Source 
Test: ./update_results.sh
Change-Id: If678fe84e4c541b709fdacd920a1c03710f99a0c
This commit is contained in:
Motomu Utsumi
2022-11-16 17:56:51 +09:00
parent e8a4470030
commit e6fc72bd46
2 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tools/gn2bp/Android.bp.swp
View File

@@ -3478,9 +3478,9 @@ cc_library_static {
"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_lite",
"cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
"libprotobuf-cpp-lite",
],
generated_headers: [
"cronet_aml_base_debugging_buildflags",
@@ -4259,9 +4259,9 @@ cc_library_static {
"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_lite",
"cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
"libprotobuf-cpp-lite",
],
generated_headers: [
"cronet_aml_build_chromeos_buildflags",
@@ -6700,6 +6700,78 @@ cc_library_static {
cpp_std: "c++20",
}
// GN: //third_party/protobuf:protobuf_lite
cc_library_static {
name: "cronet_aml_third_party_protobuf_protobuf_lite",
srcs: [
"third_party/protobuf/src/google/protobuf/any_lite.cc",
"third_party/protobuf/src/google/protobuf/arena.cc",
"third_party/protobuf/src/google/protobuf/arenastring.cc",
"third_party/protobuf/src/google/protobuf/arenaz_sampler.cc",
"third_party/protobuf/src/google/protobuf/extension_set.cc",
"third_party/protobuf/src/google/protobuf/generated_enum_util.cc",
"third_party/protobuf/src/google/protobuf/generated_message_tctable_lite.cc",
"third_party/protobuf/src/google/protobuf/generated_message_util.cc",
"third_party/protobuf/src/google/protobuf/implicit_weak_message.cc",
"third_party/protobuf/src/google/protobuf/inlined_string_field.cc",
"third_party/protobuf/src/google/protobuf/io/coded_stream.cc",
"third_party/protobuf/src/google/protobuf/io/io_win32.cc",
"third_party/protobuf/src/google/protobuf/io/strtod.cc",
"third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc",
"third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc",
"third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
"third_party/protobuf/src/google/protobuf/map.cc",
"third_party/protobuf/src/google/protobuf/message_lite.cc",
"third_party/protobuf/src/google/protobuf/parse_context.cc",
"third_party/protobuf/src/google/protobuf/repeated_field.cc",
"third_party/protobuf/src/google/protobuf/repeated_ptr_field.cc",
"third_party/protobuf/src/google/protobuf/stubs/bytestream.cc",
"third_party/protobuf/src/google/protobuf/stubs/common.cc",
"third_party/protobuf/src/google/protobuf/stubs/int128.cc",
"third_party/protobuf/src/google/protobuf/stubs/status.cc",
"third_party/protobuf/src/google/protobuf/stubs/statusor.cc",
"third_party/protobuf/src/google/protobuf/stubs/stringpiece.cc",
"third_party/protobuf/src/google/protobuf/stubs/stringprintf.cc",
"third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc",
"third_party/protobuf/src/google/protobuf/stubs/strutil.cc",
"third_party/protobuf/src/google/protobuf/stubs/time.cc",
"third_party/protobuf/src/google/protobuf/wire_format_lite.cc",
],
shared_libs: [
"liblog",
],
defaults: [
"cronet_aml_defaults",
],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
"-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
"-DGOOGLE_PROTOBUF_NO_RTTI",
"-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
"-DHAVE_PTHREAD",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
"-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
"-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
"./",
"buildtools/third_party/libc++/",
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
// GN: //third_party/zlib:zlib
cc_library_static {
name: "cronet_aml_third_party_zlib_zlib",

23
tools/gn2bp/gen_android_bp
View File

@@ -137,21 +137,6 @@ def enable_gtest_and_gmock(module):
module.whole_static_libs.add('perfetto_gtest_logcat_printer')
def enable_protobuf_full(module):
if module.type not in ['genrule', 'filegroup']:
module.static_libs.add('libprotobuf-cpp-full')
def enable_protobuf_lite(module):
if module.type not in ['genrule', 'filegroup']:
module.static_libs.add('libprotobuf-cpp-lite')
def enable_protoc_lib(module):
if module.type not in ['genrule', 'filegroup']:
module.static_libs.add('libprotoc')
def enable_libunwindstack(module):
if module.name != 'heapprofd_standalone_client':
module.shared_libs.add('libunwindstack')
@@ -233,14 +218,6 @@ builtin_deps = {
lambda x: None,
'//src/profiling/memory:bionic_libc_platform_headers_on_android':
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,
}
# ----------------------------------------------------------------------------