aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-03-07 20:37:53 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-03-08 03:45:21 +0000
commit38a2b885168ed27dfdb48771dedd1e02fd0d9b0a (patch)
treef776199efb72baa95707ed0871cd13b488ba3ca1
parentd4f3a39bee2325c0f533b4017bf9d0cc2964699c (diff)
Pick up the generate Manifest.java when creating the source jar.
-- MOS_MIGRATED_REVID=116576334
-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);
}