From 4d57f86c3df2c36763cf9cf92b8cfd206a7153b6 Mon Sep 17 00:00:00 2001 From: corysmith Date: Tue, 14 Aug 2018 08:03:51 -0700 Subject: Add test to ensure that the binary building pipeline works. RELNOTES: None PiperOrigin-RevId: 208647642 --- .../java/com/google/devtools/build/android/ResourcesZip.java | 3 ++- .../google/devtools/build/android/aapt2/ResourceLinker.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 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 71b2daa14c..6d67df59b5 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 @@ -269,7 +269,8 @@ public class ResourcesZip { Path logFile, Path workingDirectory) throws ParserConfigurationException, IOException, SAXException { - final Path shrunkApkProto = workingDirectory.resolve("shrunk.apk.pb"); + final Path shrunkApkProto = + workingDirectory.resolve("shrunk." + ResourceLinker.PROTO_EXTENSION); try (final ProtoApk apk = ProtoApk.readFrom(proto)) { final Map> toolAttributes = toAttributes(); // record resources and manifest 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 2bd13aba59..a8455d609d 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 @@ -72,8 +72,14 @@ import java.util.stream.Stream; public class ResourceLinker { private static final Predicate IS_JAR = s -> s.endsWith(".jar"); - private static final String PROTO_EXTENSION = "-pb.apk"; - private static final String BINARY_EXTENSION = "apk"; + + /** + * A file extension to indicate whether an apk is a proto or binary format. + * + * The file extension is tremendously important to aapt2 -- it uses it determine how to + * interpret the contents of the file. + */ + public static final String PROTO_EXTENSION = "-pb.apk"; private boolean debug; private static final Predicate IS_FLAT_FILE = h -> h.getFilename().endsWith(".flat"); -- cgit v1.2.3