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

Unified Diff: build/config/android/config.gni

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 5a27e78e624cf77b67f9697973a6dd3ec22c9577..77ee311f7b78d9fa38ce45317ad776d85954fe71 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -30,11 +30,6 @@ if (is_android) {
android_sdk_version = default_android_sdk_version
android_sdk_build_tools_version = default_android_sdk_build_tools_version
- # This is set when building the Android WebView inside the Android build
- # system, using the 'android' gyp backend. The WebView code is still built
- # when this is unset, but builds using the normal chromium build system.
- is_android_webview_build = false
-
android_default_keystore_path =
"//build/android/ant/chromium-debug.keystore"
android_default_keystore_name = "chromiumdebugkey"
@@ -44,6 +39,9 @@ if (is_android) {
# identifying various build artifacts corresponding to a particular build of
# chrome (e.g. where to find archived symbols).
android_chrome_build_id = "\"\""
+
+ # Set to true to run findbugs on JAR targets.
+ run_findbugs = false
}
# Host stuff -----------------------------------------------------------------
@@ -189,8 +187,4 @@ if (is_android) {
} else {
assert(false, "Unknown Android ABI: " + current_cpu)
}
-} else {
- if (!defined(is_android_webview_build)) {
- is_android_webview_build = false
- }
}

Powered by Google App Engine
This is Rietveld 408576698