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

Merge "gn2bp: Use AOSP libc and NDK"

Browse Source
This commit is contained in:
Patrick Rohr
2022-11-18 18:10:43 +00:00
committed by Gerrit Code Review
parent 61845d0b10 06e2b648ed
commit 592958fa2c
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -931,6 +931,7 @@ cc_library_static {
],
header_libs: [
"jni_headers",
"media_ndk_headers",
],
cpp_std: "c++20",
target: {
@@ -3377,24 +3378,6 @@ 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

16
tools/gn2bp/gen_android_bp
View File

@@ -131,6 +131,9 @@ additional_args = {
# that doesn't depend on rtti. undefined symbol: typeinfo 'class' errors appears.
('rtti', True), # go/undefined-symbol-typeinfo
],
'cronet_aml_base_base': [
('header_libs', set(["media_ndk_headers"])),
],
}
# Android equivalents for third-party libraries that the upstream project
@@ -1219,19 +1222,6 @@ def create_blueprint_for_targets(gn, 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)