Copy android_manifest_merger from target configuration into host configuration. -- MOS_MIGRATED_REVID=138004628
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 c3bffb5..c31245d 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 @@ host.incrementalDexingBinaries = incrementalDexingBinaries; host.nonIncrementalPerTargetDexopts = nonIncrementalPerTargetDexopts; host.dexoptsSupportedInIncrementalDexing = dexoptsSupportedInIncrementalDexing; + host.manifestMerger = manifestMerger; return host; }