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/ResourcesZip.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/ResourcesZip.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java index a1c6ab648a..3e1ecda49e 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java @@ -286,7 +286,7 @@ public class ResourcesZip { ShrunkProtoApk writeBinaryTo(ResourceLinker linker, Path binaryOut, boolean writeAsProto) throws IOException { Files.copy( - writeAsProto ? apk : linker.link(ProtoApk.readFrom(apk)), + writeAsProto ? apk : linker.optimizeApk(linker.convertToBinary(apk)), binaryOut, StandardCopyOption.REPLACE_EXISTING); return this; |