aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
diff options
context:
space:
mode:
authorGravatar corysmith <corysmith@google.com>2017-04-20 00:19:47 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-04-20 11:08:18 +0200
commit3c0bb56a74478cff675b636d5bf605a652451739 (patch)
treebb45dfb397ca59c1c20fabfc0971abc77455e106 /src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
parent652db6f23dce7351dcaf9755857e4827555d42c9 (diff)
Automated g4 rollback of commit 3217832d638f9a8fdf22e88e32d75bda32ff7235.
*** Reason for rollback *** Causes issues with library R generation. *** Original change description *** Refactor the RClassGenerator to be reusable for different packages. RELNOTES: None PiperOrigin-RevId: 153641485
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
index 1f0360c85b..37fb7a81a2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
@@ -474,8 +474,8 @@ public class AndroidResourceClassWriter implements Flushable {
private void writeAsClass(Map<ResourceType, List<FieldInitializer>> initializers)
throws IOException {
RClassGenerator rClassGenerator =
- new RClassGenerator(outputBasePath, initializers, false /* finalFields */);
- rClassGenerator.write(packageName);
+ new RClassGenerator(outputBasePath, packageName, initializers, false /* finalFields */);
+ rClassGenerator.write();
}
private static String normalizeName(String resourceName) {