diff options
author | corysmith <corysmith@google.com> | 2018-08-10 11:55:28 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-10 11:57:25 -0700 |
commit | da493a94561286493523b18cd037247898eb04fb (patch) | |
tree | 8bb3a8d0d4a51b488cc55ae4fb19c098b8987e59 /src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java | |
parent | 9efbc25845c5ec4e6eece8540079fb33669e39e5 (diff) |
Automated rollback of commit 29b57c3afcfeb8e3fedcc2edcb0f28f13c784179.
*** Reason for rollback ***
Rolling forward with assets being included after relinking.
*** Original change description ***
Automated rollback of commit bab4b04ad09a571615d04aacadf8b3a2b820ba5f.
*** Reason for rollback ***
Appears to cause issues with the new apk.
*** Original change description ***
Relink instead of convert proto apks.
RELNOTES: None
PiperOrigin-RevId: 208245517
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java index 2db283fdca..e9fa1cb338 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java @@ -95,7 +95,8 @@ public class Aapt2ResourceShrinkingAction { final ResourceLinker linker = ResourceLinker.create( aapt2ConfigOptions.aapt2, executorService, scopedTmp.subDirectoryOf("linking")) - .profileUsing(profiler); + .profileUsing(profiler) + .dependencies(ImmutableList.of(StaticLibrary.from(aapt2ConfigOptions.androidJar))); final Set<String> packages = options |