Add the original bundle to the library model.

This gives access both to the aar file and the exploded
folder (which may not be exploded yet when the model is queried).

Change-Id: Ieeba1ab19a8746448b047c73bcd1dcb23b47ab11

1 files changed, 17 insertions, 5 deletions

diff --git a/builder/src/main/java/com/android/builder/dependency/LibraryBundle.java b/builder/src/main/java/com/android/builder/dependency/LibraryBundle.java
index aff858b..a6083ff 100644
--- a/builder/src/main/java/com/android/builder/dependency/LibraryBundle.java
+++ b/builder/src/main/java/com/android/builder/dependency/LibraryBundle.java
@@ -34,20 +34,26 @@ public abstract class LibraryBundle implements LibraryDependency {
     public static final String FN_PROGUARD_TXT = "proguard.txt";
 
     private final String mName;
+    private final File mBundle;
     private final File mBundleFolder;
 
     /**
      * Creates the bundle dependency with an optional name
-     * @param bundleFolder the folder containing the library
+     *
+     * @param bundle the library's aar bundle file
+     * @param bundleFolder the folder containing the unarchived library content
      * @param name an optional name
      */
-    protected LibraryBundle(@NonNull File bundleFolder, @Nullable String name) {
-        mName = name;
+    protected LibraryBundle(@NonNull File bundle,
+                            @NonNull File bundleFolder,
+                            @Nullable String name) {
+        mBundle = bundle;
         mBundleFolder = bundleFolder;
+        mName = name;
     }
 
-    protected LibraryBundle(@NonNull File bundleFolder) {
-        this(bundleFolder, null);
+    protected LibraryBundle(@NonNull File bundle, @NonNull File bundleFolder) {
+        this(bundle, bundleFolder, null);
     }
 
     public String getName() {
@@ -73,6 +79,12 @@ public abstract class LibraryBundle implements LibraryDependency {
 
     @Override
     @NonNull
+    public File getBundle() {
+        return mBundle;
+    }
+
+    @Override
+    @NonNull
     public File getFolder() {
         return mBundleFolder;
     }