From e516a101bb615f064d6622a5d4add541617b8c1f Mon Sep 17 00:00:00 2001
From: corysmith <corysmith@google.com>
Date: Wed, 23 Aug 2017 15:24:31 +0200
Subject: Adds compile action for aapt2: Aapt2ResourcePackagingAction Adds a
 ManifestContainer interface to centralize the types that provide manifests.
 Adds PackagedResources to represent a linked dexless resource apk

RELNOTES: None
PiperOrigin-RevId: 166193049
---
 .../com/google/devtools/build/android/MergedAndroidData.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java')

diff --git a/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
index a69b02d71b..431d205e12 100644
--- a/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
@@ -17,15 +17,15 @@ import java.nio.file.Path;
 
 /**
  * Represents the AndroidData before processing, after merging.
- * 
- * <p>
- * The life cycle of AndroidData goes:
+ *
+ * <p>The life cycle of AndroidData goes:
+ *
  * <pre>
  * UnvalidatedAndroidData -> MergedAndroidData -> DensityFilteredAndroidData
  *      -> DependencyAndroidData
  * </pre>
  */
-class MergedAndroidData {
+class MergedAndroidData implements ManifestContainer {
 
   private Path resourceDir;
   private Path assetDir;
@@ -45,6 +45,7 @@ class MergedAndroidData {
     return assetDir;
   }
 
+  @Override
   public Path getManifest() {
     return manifest;
   }
-- 
cgit v1.2.3