From e8243465731f5c407448e7b9d5686663f149b9da Mon Sep 17 00:00:00 2001
From: asteinb <asteinb@google.com>
Date: Wed, 11 Apr 2018 14:26:07 -0700
Subject: 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
---
 .../rules/android/AndroidResourceParsingActionBuilder.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java')

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);
   }
 
   /**
-- 
cgit v1.2.3