diff options
| author |  corysmith <corysmith@google.com> | 2017-04-25 17:33:48 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-25 20:38:40 +0200 |
| commit | 641318ac48dd4f110184c42b4b75485ee61416a8 (patch) | |
| tree | 8eb64d4739516a2e115544a94551201bd29ba70a /src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java | |
| parent | a900f00e5f83d859bd404aa79bc9281b2886ae00 (diff) | |
Automated g4 rollback of commit 3c0bb56a74478cff675b636d5bf605a652451739.
*** Reason for rollback ***
Rolling forward with a fix to avoid writing all resources to empty libraries.
*** Original change description ***
Automated g4 rollback of commit bdf0230534a59dab954ee76c5bf640394c88984e.
*** 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: 154175593
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.java | 4 |
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 37fb7a81a2..1f0360c85b 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, packageName, initializers, false /* finalFields */); - rClassGenerator.write(); + new RClassGenerator(outputBasePath, initializers, false /* finalFields */); + rClassGenerator.write(packageName); } private static String normalizeName(String resourceName) { |