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

Unified Diff: breakpad/BUILD.gn

Issue 2154593002: [Android] Define the Android NDK major version for breakpad. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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: breakpad/BUILD.gn
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
index 8174013378acd2eb121cdcd72474040f39f902d3..6dbedc6ee8262e7a51a2dc5ba80c84a7f47246be 100644
--- a/breakpad/BUILD.gn
+++ b/breakpad/BUILD.gn
@@ -37,6 +37,7 @@ config("internal_config") {
config("client_config") {
include_dirs = [ "src" ]
if (is_android) {
+ defines = [ "ANDROID_NDK_MAJOR_VERSION=${android_ndk_major_version}" ]
include_dirs += [ "src/common/android/include" ]
}
}
@@ -677,13 +678,15 @@ if (is_linux || is_android) {
include_dirs = [
"linux", # Use our copy of breakpad_googletest_includes.h
- "src",
".",
]
# There are some warnings in this code.
configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
+ configs += [
+ ":client_config",
+ "//build/config/compiler:no_chromium_code",
+ ]
if (is_clang) {
# See http://crbug.com/138571#c18
@@ -694,7 +697,6 @@ if (is_linux || is_android) {
use_raw_android_executable = true
sources += [ "src/common/android/breakpad_getcontext_unittest.cc" ]
libs = [ "log" ]
- include_dirs += [ "src/common/android/include" ]
extra_dist_files = [ "$root_out_dir/linux_dumper_unittest_helper" ]
}
@@ -718,11 +720,7 @@ if (is_linux || is_android) {
"//build/config/sanitizers:deps",
]
- include_dirs = [ "src" ]
-
- if (current_cpu == "mipsel" && is_android) {
- include_dirs += [ "src/common/android/include" ]
- }
+ configs += [ ":client_config" ]
}
executable("generate_test_dump") {
@@ -734,18 +732,18 @@ if (is_linux || is_android) {
# This file has an unused variable warning.
configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
+ configs += [
+ ":client_config",
+ "//build/config/compiler:no_chromium_code",
+ ]
deps = [
":client",
"//build/config/sanitizers:deps",
]
- include_dirs = [ "src" ]
-
if (is_android) {
libs = [ "log" ]
- include_dirs += [ "src/common/android/include" ]
}
}
« 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