diff options
| author |  corysmith <corysmith@google.com> | 2017-11-08 20:10:36 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-09 18:29:04 +0100 |
| commit | 743ea216879dd0e3037d4b34eff92ba8af493554 (patch) | |
| tree | a56fe6988297bc022a328c911b60b2f0249e0df6 /src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java | |
| parent | f5a109157ed048ff253bb2ba70f3e4372ec125ba (diff) | |
Fix resource shrinking to filter densities and include assets.
RELNOTES: None
PiperOrigin-RevId: 175033155
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java index 7f653d7808..309fa235ab 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java @@ -21,6 +21,7 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Streams; import com.google.devtools.build.android.AaptCommandBuilder; import com.google.devtools.build.android.AndroidResourceOutputs; import com.google.devtools.build.android.Profiler; @@ -216,7 +217,12 @@ public class ResourceLinker { .when(densities.size() == 1) .thenAddRepeated("--preferred-density", densities) .add("--stable-ids", compiled.getStableIds()) - .addRepeated("-A", assetDirs.stream().map(Path::toString).collect(toList())) + .addRepeated( + "-A", + Streams.concat( + assetDirs.stream().map(Path::toString), + compiled.getAssetsStrings().stream()) + .collect(toList())) .addRepeated("-I", StaticLibrary.toPathStrings(linkAgainst)) .addRepeated( "-R", |