diff options
| author |  Michael Staib <mstaib@google.com> | 2016-12-20 00:04:37 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-12-20 06:13:50 +0000 |
| commit | c97699661d48fc12ffbf4809c27d13d7caf017d7 (patch) | |
| tree | f19c4d3f6eb3e33b9a484a0e1f4e5dfdff8fa7f8 /src/tools/android/java/com/google/devtools | |
| parent | 733baeda5a300ac31f1b7bfb85f4d7c4b13f1357 (diff) | |
Allow ResourceShrinkerAction to support splits.
This is needed to support both shrinking and splitting at the same time,
which will become the default for any android_binary which has splits
defined on it once shrinking becomes default (if it hasn't already).
--
PiperOrigin-RevId: 142497302
MOS_MIGRATED_REVID=142497302
Diffstat (limited to 'src/tools/android/java/com/google/devtools')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java index 0b8c600c41..76b5433702 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java @@ -244,7 +244,7 @@ public class ResourceShrinkerAction { null /* packageForR */, new FlagAaptOptions(aaptConfigOptions), aaptConfigOptions.resourceConfigs, - ImmutableList.<String>of() /* splits */, + aaptConfigOptions.splits, new MergedAndroidData( shrunkResources, resourceFiles.resolve("assets"), options.primaryManifest), ImmutableList.<DependencyAndroidData>of() /* libraries */, |