summaryrefslogtreecommitdiffstats
path: root/build/config/android/config.gni
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-10-02 10:27:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-02 17:28:49 +0000
commitfef292dbfd9b6cea6ae67ad1e939f8efc489b039 (patch)
tree095862f848d1cf412bca98bc145778e2943783b9 /build/config/android/config.gni
parentb136e1257ec0512058dfee15126386821c231d61 (diff)
downloadchromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.zip
chromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.tar.gz
chromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.tar.bz2
Fix javac --incremental by using jmake for dependency analysis
BUG=536817 Review URL: https://codereview.chromium.org/1373723003 Cr-Commit-Position: refs/heads/master@{#352065}
Diffstat (limited to 'build/config/android/config.gni')
-rw-r--r--build/config/android/config.gni10
1 files changed, 8 insertions, 2 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 7abf51a..7ca1b70 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.