Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Unified Diff: build/config/android/BUILD.gn

Issue 2409173004: android: Make 64-bit chromes compile with clang. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/config.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index c0f89212e3f8815358dda2a90b9bb261373fabbe..e4837d4d99ce412c4457d06521c090c1d8360178 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -63,8 +63,6 @@ config("compiler") {
} else if (current_cpu == "x86") {
abi_target = "i686-linux-androideabi"
} else if (current_cpu == "arm64") {
- # Place holder for arm64 support, not tested.
- # TODO: Enable clang support for Android Arm64. http://crbug.com/539781
abi_target = "aarch64-linux-android"
} else if (current_cpu == "x64") {
# Place holder for x64 support, not tested.
@@ -149,6 +147,21 @@ config("runtime_library") {
"__compiler_offsetof=__builtin_offsetof",
"nan=__builtin_nan",
]
+
+ if (current_cpu == "x64" || current_cpu == "arm64" ||
+ current_cpu == "mips64el") {
+ # 64-bit targets build with NDK 21, 32-bit targets with NDK 16
+ # (see ./config.gni). When using clang, NDK 21 defines snprintf to
+ # something for a kind of for of _FORTIFY_SOURCE support, see
+ # third_party/android_tools/ndk/platforms/android-21/arch-x86_64/usr/include/stdio.h
+ # Making snprintf a macro breaks base/strings/string_utils.h which
+ # defines base::snprintf(). So define snprintf to itself to force the
+ # NDK to not redefine it. This disables _chk for snprintf, but since
+ # 32-bit versions use NDK 16 which doesn't have any fortify support, that
+ # seems ok. b/32067310 tracks better fortify support with clang.
+ # TODO(thakis): Remove this once b/32067310 is fixed.
+ defines += [ "snprintf=snprintf" ]
+ }
}
# TODO(jdduke) Re-enable on mips after resolving linking
« no previous file with comments | « no previous file | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698