diff options
| author |  corysmith <corysmith@google.com> | 2018-08-06 12:43:52 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-06 12:45:40 -0700 |
| commit | 29b57c3afcfeb8e3fedcc2edcb0f28f13c784179 (patch) | |
| tree | 931c8c6edc98fe5a5ab38cd39fa369b05a14b615 /src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java | |
| parent | 6bc3fcdffbac0a704929e66e05d96845781afa93 (diff) | |
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: 207590807
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 | 5 |
1 files changed, 2 insertions, 3 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 4ea6f2b11d..2db283fdca 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 @@ -62,7 +62,7 @@ public class Aapt2ResourceShrinkingAction { public static final class Aapt2ShrinkOptions extends OptionsBase { @Option( name = "useProtoApk", - defaultValue = "true", + defaultValue = "false", category = "config", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -95,8 +95,7 @@ public class Aapt2ResourceShrinkingAction { final ResourceLinker linker = ResourceLinker.create( aapt2ConfigOptions.aapt2, executorService, scopedTmp.subDirectoryOf("linking")) - .profileUsing(profiler) - .dependencies(ImmutableList.of(StaticLibrary.from(aapt2ConfigOptions.androidJar))); + .profileUsing(profiler); final Set<String> packages = options |