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

Merge "gn2bp: move sysroot include to cc_default"

Browse Source
This commit is contained in:
Motomu Utsumi
2022-11-18 09:33:26 +00:00
committed by Gerrit Code Review
parent dfea18945c 81435163b0
commit be62aee3df
2 changed files with 33 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,6 @@ cc_library_static {
],
local_include_dirs: [
"third_party/android_ndk/sources/android/cpufeatures/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
@@ -239,10 +238,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -1006,7 +1001,6 @@ cc_library_static {
],
local_include_dirs: [
"third_party/android_ndk/sources/android/cpufeatures/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
@@ -1042,10 +1036,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -1359,9 +1349,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -1373,10 +1360,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -1704,9 +1687,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -1718,10 +1698,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -1762,9 +1738,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -1776,10 +1749,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -1821,8 +1790,6 @@ cc_library_static {
"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",
}
@@ -1869,8 +1836,6 @@ cc_library_static {
"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",
}
@@ -1912,8 +1877,6 @@ cc_library_static {
"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",
}
@@ -2248,7 +2211,6 @@ cc_library_shared {
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
"third_party/zlib/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
header_libs: [
"jni_headers",
@@ -2639,7 +2601,6 @@ cc_library_static {
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
header_libs: [
"jni_headers",
@@ -2754,9 +2715,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
srcs: [
@@ -2778,10 +2736,8 @@ cc_library_static {
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/nss",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
@@ -2806,6 +2762,24 @@ cc_defaults {
"-fvisibility=hidden",
],
stl: "none",
target: {
android_x86: {
export_system_include_dirs: [
"build/linux/debian_bullseye_i386-sysroot/usr/include",
],
},
android_x86_64: {
export_system_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
host: {
export_system_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
},
}
// GN: //ipc:param_traits
@@ -3682,7 +3656,6 @@ cc_library_static {
"third_party/brotli/include/",
"third_party/protobuf/src/",
"third_party/zlib/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
header_libs: [
"jni_headers",
@@ -3893,7 +3866,6 @@ cc_library_static {
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -4439,7 +4411,6 @@ cc_library_static {
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
"third_party/zlib/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -4502,7 +4473,6 @@ cc_library_static {
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -5584,9 +5554,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -5598,10 +5565,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -5676,7 +5639,6 @@ cc_library_static {
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/brotli/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -5720,7 +5682,6 @@ cc_library_static {
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/brotli/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -6023,9 +5984,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -6037,10 +5995,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -6298,9 +6252,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -6312,10 +6263,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -6376,7 +6323,6 @@ cc_library_static {
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
"third_party/libevent/android/",
],
},
@@ -6391,8 +6337,6 @@ cc_library_static {
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"third_party/libevent/linux/",
],
},
@@ -6576,9 +6520,6 @@ cc_library_static {
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DHAVE_SYS_UIO_H",
],
local_include_dirs: [
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
cflags: [
@@ -6590,10 +6531,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -6726,8 +6663,6 @@ cc_library_static {
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
"third_party/zlib/",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -6800,7 +6735,6 @@ cc_library_static {
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -6859,8 +6793,6 @@ cc_binary {
"buildtools/third_party/libc++/trunk/src/",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
cppflags: [
@@ -6997,8 +6929,6 @@ cc_library_static {
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
],
cpp_std: "c++20",
}
@@ -7074,7 +7004,6 @@ cc_library_static {
],
local_include_dirs: [
"third_party/android_ndk/sources/android/cpufeatures/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
},
host: {
@@ -7087,10 +7016,6 @@ cc_library_static {
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
],
local_include_dirs: [
"build/linux/debian_bullseye_amd64-sysroot/usr/include",
"build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu",
],
},
},
}
@@ -7237,7 +7162,6 @@ cc_library_static {
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
],
header_libs: [
"jni_headers",

24
tools/gn2bp/gen_android_bp
View File

@@ -209,6 +209,7 @@ class Target(object):
self.stl = None
self.cppflags = set()
self.local_include_dirs = []
self.export_system_include_dirs = set()
def to_string(self, output):
nested_out = []
@@ -222,6 +223,7 @@ class Target(object):
self._output_field(nested_out, 'strip')
self._output_field(nested_out, 'cppflags')
self._output_field(nested_out, 'local_include_dirs')
self._output_field(nested_out, 'export_system_include_dirs')
if nested_out:
output.append(' %s: {' % self.name)
@@ -989,15 +991,6 @@ def set_module_include_dirs(module, cflags, include_dirs):
if not re.match('^//out/.*', d)])
module.local_include_dirs = sorted(list(local_include_dirs_set))
# Order matters for some targets. For example, base/time/time_exploded_icu.cc
# in //base:base needs to have sysroot include after icu/source/common
# include. So adding sysroot include at the end.
for flag in sorted(cflags):
if '--sysroot' in flag:
sysroot = flag[len('--sysroot=../../'):]
if sysroot == "build/linux/debian_bullseye_amd64-sysroot":
module.local_include_dirs.append(sysroot + "/usr/include/x86_64-linux-gnu")
module.local_include_dirs.append(sysroot + "/usr/include")
def create_modules_from_target(blueprint, gn, gn_target_name):
"""Generate module(s) for a given GN target.
@@ -1226,6 +1219,19 @@ def create_blueprint_for_targets(gn, desc, targets):
'-Wno-unreachable-code-loop-increment', # needed for icui18n
'-O2',
]
# TODO: can we get these from somewhere else?
# TODO: what to do for arm?
defaults.target['android_x86'].export_system_include_dirs = [
'build/linux/debian_bullseye_i386-sysroot/usr/include',
]
defaults.target['android_x86_64'].export_system_include_dirs = [
'build/linux/debian_bullseye_amd64-sysroot/usr/include',
'build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu',
]
defaults.target['host'].export_system_include_dirs = [
# TODO: do we need this?
'third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include',
]
defaults.stl = 'none'
blueprint.add_module(defaults)