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

gn2bp: handle target-specific dependencies

Browse Source 
This currently only supports cc_library_static as its the only target
that is currently used in this way.

Test: //components/cronet/android:cronet
Change-Id: Ia3f0338f486890835691c1435ee1a297d9e62f81
This commit is contained in:
Patrick Rohr
2022-11-16 23:49:03 -08:00
parent 297f979e8f
commit b51878f6c3
2 changed files with 155 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1026,6 +1026,11 @@ cc_library_static {
"base/stack_canary_linux.cc",
"base/threading/platform_thread_linux.cc",
],
static_libs: [
"cronet_aml_base_third_party_symbolize_symbolize",
"cronet_aml_base_third_party_xdg_mime_xdg_mime",
"cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs",
],
cflags: [
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DGLOG_EXPORT=",
@@ -1779,6 +1784,140 @@ cc_library_static {
},
}
// GN: //base/third_party/symbolize:symbolize
cc_library_static {
name: "cronet_aml_base_third_party_symbolize_symbolize",
srcs: [
"base/third_party/symbolize/demangle.cc",
"base/third_party/symbolize/symbolize.cc",
],
host_supported: true,
device_supported: false,
defaults: [
"cronet_aml_defaults",
],
cflags: [
"-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
"-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGLOG_EXPORT=",
"-DUSE_AURA=1",
"-DUSE_OZONE=1",
"-DUSE_UDEV",
"-D_DEBUG",
"-D_FILE_OFFSET_BITS=64",
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_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",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
}
// GN: //base/third_party/xdg_mime:xdg_mime
cc_library_static {
name: "cronet_aml_base_third_party_xdg_mime_xdg_mime",
srcs: [
"base/third_party/xdg_mime/xdgmime.c",
"base/third_party/xdg_mime/xdgmimealias.c",
"base/third_party/xdg_mime/xdgmimecache.c",
"base/third_party/xdg_mime/xdgmimeglob.c",
"base/third_party/xdg_mime/xdgmimeicon.c",
"base/third_party/xdg_mime/xdgmimeint.c",
"base/third_party/xdg_mime/xdgmimemagic.c",
"base/third_party/xdg_mime/xdgmimeparent.c",
],
host_supported: true,
device_supported: false,
defaults: [
"cronet_aml_defaults",
],
cflags: [
"-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
"-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DUSE_AURA=1",
"-DUSE_OZONE=1",
"-DUSE_UDEV",
"-D_DEBUG",
"-D_FILE_OFFSET_BITS=64",
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_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",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
}
// GN: //base/third_party/xdg_user_dirs:xdg_user_dirs
cc_library_static {
name: "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs",
srcs: [
"base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc",
],
host_supported: true,
device_supported: false,
defaults: [
"cronet_aml_defaults",
],
cflags: [
"-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
"-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DUSE_AURA=1",
"-DUSE_OZONE=1",
"-DUSE_UDEV",
"-D_DEBUG",
"-D_FILE_OFFSET_BITS=64",
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_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",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
],
local_include_dirs: [
"./",
"buildtools/third_party/libc++/",
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
}
// GN: //base:tracing_buildflags
genrule {
name: "cronet_aml_base_tracing_buildflags",
@@ -2624,6 +2763,11 @@ cc_library_static {
"crypto/nss_key_util.cc",
"crypto/nss_util.cc",
],
static_libs: [
"cronet_aml_base_third_party_symbolize_symbolize",
"cronet_aml_base_third_party_xdg_mime_xdg_mime",
"cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs",
],
cflags: [
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DUSE_AURA=1",

11
tools/gn2bp/gen_android_bp
View File

@@ -1160,6 +1160,17 @@ def create_modules_from_target(blueprint, gn, gn_target_name):
raise Error('Unknown dep %s (%s) for target %s' %
(dep_module.name, dep_module.type, module.name))
for arch_name, arch in target.arch.items():
for dep_name in arch.deps:
dep_module = create_modules_from_target(blueprint, gn, dep_name)
# Arch-specific dependencies currently only include cc_library_static.
# Revisit this approach once we need to support more target types.
if dep_module.type == 'cc_library_static':
module.target[arch_name].static_libs.add(dep_module.name)
else:
raise Error('Unsupported arch-specific dependency %s of target %s with type %s' %
(dep_module.name, target.name, dep_module.type))
return module
def create_java_module(blueprint, gn):