diff options
| author |  corysmith <corysmith@google.com> | 2017-08-23 15:24:31 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-23 15:46:23 +0200 |
| commit | e516a101bb615f064d6622a5d4add541617b8c1f (patch) | |
| tree | 93b6a3989b048a1cd35d9c1b37f411f77ec556bc /src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java | |
| parent | 296cb428546a7e966065b03137eca362efb9f34c (diff) | |
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
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java index 6840ac8cc4..1fb31561ed 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java @@ -22,7 +22,6 @@ import com.google.common.base.Stopwatch; import com.google.common.base.Strings; import com.google.common.io.Files; import com.google.devtools.build.android.AndroidDataMerger.MergeConflictException; -import com.google.devtools.build.android.AndroidManifestProcessor.MergeErrorException; import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.AndroidResourceProcessor.AaptConfigOptions; import com.google.devtools.build.android.Converters.ExistingPathConverter; @@ -287,7 +286,7 @@ public class AndroidResourceMergingAction { } catch (MergingException e) { logger.log(Level.SEVERE, "Error during merging resources", e); throw e; - } catch (MergeErrorException e) { + } catch (AndroidManifestProcessor.ManifestProcessingException e) { System.exit(1); } catch (Exception e) { logger.log(Level.SEVERE, "Unexpected", e); |