diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-09-24 08:34:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-24 08:34:54 +0000 |
| commit | e908a056a91756d156c5c5947e61b862f1e1336a (patch) | |
| tree | 83140b74f9ed5a6604adb13ad03796ee3057dcb2 /jack | |
| parent | 66e20221c61f401f3e5911dd5246270f69973f00 (diff) | |
| parent | b4bdc83b4967df3bb8fa7dbc5ae6b2ebc46c9053 (diff) | |
| download | toolchain_jack-e908a056a91756d156c5c5947e61b862f1e1336a.zip toolchain_jack-e908a056a91756d156c5c5947e61b862f1e1336a.tar.gz toolchain_jack-e908a056a91756d156c5c5947e61b862f1e1336a.tar.bz2 | |
Merge "Add an hidden option to disable automatic rebuild" into ub-jack
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/src/com/android/jack/Options.java | 7 | ||||
| -rw-r--r-- | jack/src/com/android/jack/experimental/incremental/JackIncremental.java | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java index 91aa9b5..1dbfdc6 100644 --- a/jack/src/com/android/jack/Options.java +++ b/jack/src/com/android/jack/Options.java @@ -189,6 +189,9 @@ public class Options { metaVar = "[error | warning | info | debug | trace]") protected VerbosityLevel verbose = VerbosityLevel.WARNING; + @Option(name = "--disable-automatic-full-rebuild") + protected boolean disableAutomaticFullRebuild = false; + @Option(name = "--incremental-folder", usage = "Folder used for incremental data", metaVar = "FILE") protected File incrementalFolder = null; @@ -791,6 +794,10 @@ public class Options { this.incrementalFolder = incrementalFolder; } + public boolean isAutomaticFullRebuildEnabled() { + return !disableAutomaticFullRebuild; + } + @Nonnull private static Directory createTempDirForTypeDexFiles( @Nonnull RunnableHooks hooks) { diff --git a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java index 1f263a6..7afa2ad 100644 --- a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java +++ b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java @@ -270,6 +270,10 @@ public class JackIncremental extends CommandLine { * option is more recent than the generated dex file. */ private static boolean needFullRebuild(@Nonnull Options options) { + if (!options.isAutomaticFullRebuildEnabled()) { + return false; + } + File outputDexFile = new File(options.getOutputDir(), DexFileWriter.DEX_FILENAME); if (outputDexFile.exists()) { for (File lib : options.getBootclasspath()) { |