diff options
author | 2016-11-02 22:46:49 +0000 | |
---|---|---|
committer | 2016-11-03 07:17:24 +0000 | |
commit | 9ea049313ace3affea177732b0b193ce17c83412 (patch) | |
tree | 2a069e9cc2f4050b7f27a93831d7a461f96e973c | |
parent | e7516daf577c41835f6752e4d9e92b6f8b67bf48 (diff) |
Copy android_manifest_merger from target configuration into host configuration.
--
MOS_MIGRATED_REVID=138004628
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index c3bffb5137..c31245df09 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -430,6 +430,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { host.incrementalDexingBinaries = incrementalDexingBinaries; host.nonIncrementalPerTargetDexopts = nonIncrementalPerTargetDexopts; host.dexoptsSupportedInIncrementalDexing = dexoptsSupportedInIncrementalDexing; + host.manifestMerger = manifestMerger; return host; } |