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

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

Issue 1373723003: Fix javac --incremental by using jmake for dependency analysis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@aidl
Patch Set: fix license check Created 5 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 | « build/android/gyp/util/md5_check.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 7abf51ab9f49490ff18eb207bcdf3ef6e6653d9c..7ca1b70bac698973dc23d5050e9bbcc31229a23e 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -71,10 +71,16 @@ if (is_android) {
disable_incremental_isolated_processes = false
# Speed up incremental compiles by compiling only changed files.
- incremental_javac = false
+ enable_incremental_javac = false
# Speed up dexing using dx --incremental.
- incremental_dx = true
+ enable_incremental_dx = is_debug
+
+ # Neither of these should ever be used for release builds since they are
+ # somewhat experimental and dx --incremental is known to not produce
+ # byte-for-byte identical output.
+ assert(!(enable_incremental_dx && !is_debug))
+ assert(!(enable_incremental_javac && !is_debug))
# Adds intrumentation to each function. Writes a file with the order that
# functions are called at startup.
« no previous file with comments | « build/android/gyp/util/md5_check.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698