aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index bca53a7761..18abc05786 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -644,9 +644,9 @@ public class AndroidResourceProcessor {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
- if (file.getFileName().endsWith("R.java")) {
+ if (file.getFileName().endsWith("R.java") || file.getFileName().endsWith("Manifest.java")) {
byte[] content = Files.readAllBytes(file);
- if (staticIds) {
+ if (staticIds && file.getFileName().endsWith("R.java")) {
content = replaceIdsWithStaticIds(UTF_8.decode(
ByteBuffer.wrap(content)).toString()).getBytes(UTF_8);
}