mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-23 22:06:12 +03:00
Code Issues Projects Releases Wiki Activity

Fix android build

Browse Source
This commit is contained in:
klzgrad 2022-01-06 00:07:23 +08:00
parent 92976967dd
commit c6606de1d2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/BUILD.gn
View File

@ -1475,7 +1475,7 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a # building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this. # more robust check for this.
if (!use_sysroot && if (!use_sysroot &&
(is_android || ((is_linux || is_chromeos) && !is_chromecast)) && ((is_linux || is_chromeos) && !is_chromecast) &&
host_toolchain != "//build/toolchain/cros:host") { host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ] libs += [ "atomic" ]
} }

11
src/buildtools/third_party/libc++abi/BUILD.gn vendored
View File

@ -112,4 +112,15 @@ source_set("libc++abi") {
"//build/config/compiler:no_rtti", "//build/config/compiler:no_rtti",
] ]
} }
if (is_android) {
sources += [
"trunk/src/private_typeinfo.cpp",
]
configs -= [
"//build/config/compiler:no_rtti",
]
configs += [
"//build/config/compiler:rtti",
]
}
} }