diff options
| author |  corysmith <corysmith@google.com> | 2018-01-25 10:33:38 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-25 10:35:39 -0800 |
| commit | ffaef29064dededa522b82715f35e2f190417d58 (patch) | |
| tree | 20dc024101873c9fe6ec6da8c76e2ead100903af /src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java | |
| parent | 15bf148ea28ee2bb817327749c291a76928c0803 (diff) | |
Add the ability to output the resource table as a protocol buffer to the Aapt2ResourcePackagingAction
Ensure that the custom package is respected in aapt2. This only impact the srcjar, as the classes are generated via another method.
RELNOTES: None
PiperOrigin-RevId: 183260369
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java index 50d18c9c1c..ac072dbf4a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java @@ -176,6 +176,8 @@ public class Aapt2ResourcePackagingAction { final PackagedResources packagedResources = ResourceLinker.create(aaptConfigOptions.aapt2, linkedOut) .profileUsing(profiler) + .customPackage(options.packageForR) + .outputAsProto(aaptConfigOptions.resourceTableAsProto) .dependencies(ImmutableList.of(StaticLibrary.from(aaptConfigOptions.androidJar))) .include(compiledResourceDeps) .withAssets(assetDirs) |