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

Unified Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 1564443002: Fix x64 android_tools target compile failure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 11 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 | « build/android/ndk.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index fa2f67ab93589e27db7daae4c7e07e66dc524ed4..e256258ebb30988d9f5bd13ab24f25223b46d2e8 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -8,6 +8,13 @@ config("cpu_features_include") {
include_dirs = [ "ndk/sources/android/cpufeatures" ]
}
+config("cpu_features_warnings") {
+ if (is_clang) {
+ # cpu-features.c has few unused functions on x86 b/26403333
+ cflags = [ "-Wno-unused-function" ]
+ }
+}
+
# This is the GN version of
# //build/android/ndk.gyp:cpu_features
source_set("cpu_features") {
@@ -17,7 +24,12 @@ source_set("cpu_features") {
public_configs = [ ":cpu_features_include" ]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
+ configs += [
+ "//build/config/compiler:no_chromium_code",
+
+ # Must be after no_chromium_code for warning flags to be ordered correctly.
+ ":cpu_features_warnings",
+ ]
}
android_java_prebuilt("android_gcm_java") {
« no previous file with comments | « build/android/ndk.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698