diff options
author | 2018-04-11 14:26:07 -0700 | |
---|---|---|
committer | 2018-04-11 14:27:21 -0700 | |
commit | e8243465731f5c407448e7b9d5686663f149b9da (patch) | |
tree | eca2f1d9bfa338b42c9a051522c35976477f5be3 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java | |
parent | 0fcad77c50290a66bdf3870eda7ec7656549c2eb (diff) |
Add skipped manifest processing methods
Add some required manifest support I didn't previously implement:
- Support for exports_manifest field
- Get properly processed manifest from AndroidSemantics
- Correctly represent the current relationship between manifest and resource
processing - resource processing uses the stamped manifest.
RELNOTES: none
PiperOrigin-RevId: 192508962
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java index c890627b71..842e20cc7e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java @@ -190,12 +190,19 @@ public class AndroidResourceParsingActionBuilder { * Builds and registers the action, and returns a copy of the passed resources with artifacts for * parsed and compiled information. */ - public ParsedAndroidResources build(AndroidResources androidResources) { + public ParsedAndroidResources build( + AndroidResources androidResources, StampedAndroidManifest manifest) { + if (dataBindingInfoZip != null) { + // Manifest information is needed for data binding + setManifest(manifest.getManifest()); + setJavaPackage(manifest.getPackage()); + } + setResources(androidResources); build(ruleContext); return ParsedAndroidResources.of( - androidResources, output, compiledSymbols, ruleContext.getLabel()); + androidResources, output, compiledSymbols, ruleContext.getLabel(), manifest); } /** |