commit 03c8effb06f7898e03c671db5ffd2f3a5c93d918
author Rico Wind <ricow@google.com> Thu Apr 19 14:12:21 2018 +0200
committer Rico Wind <ricow@google.com> Thu Apr 19 14:12:21 2018 +0200
tree 04fb31429e2333fe9f413226e5fbf3c850a172b8
parent f0573db221ffbe18418224bf6ec90fb2b7c35656

Fix default basename for spec generated split

Change-Id: I907be526cd2e3ffb9b9be3a3e31e78de0d276a84

src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java

diff --git a/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java b/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
index 5281eac..16025f9 100644
--- a/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
+++ b/src/main/java/com/android/tools/r8/utils/FeatureClassMapping.java
@@ -43,7 +43,7 @@
   HashSet<FeaturePredicate> mappings = new HashSet<>();
 
   Path mappingFile;
-  String baseName;
+  String baseName = DEFAULT_BASE_NAME;
 
   static final String DEFAULT_BASE_NAME = "base";
 
@@ -54,7 +54,6 @@
   public static FeatureClassMapping fromSpecification(Path file)
       throws FeatureMappingException, IOException {
     FeatureClassMapping mapping = new FeatureClassMapping();
-    mapping.baseName = DEFAULT_BASE_NAME;
     List<String> lines = FileUtils.readAllLines(file);
     for (int i = 0; i < lines.size(); i++) {
       String line = lines.get(i);
@@ -66,7 +65,9 @@
   public static FeatureClassMapping fromJarFiles(List<FeatureJar> featureJars, String baseName)
       throws FeatureMappingException, IOException {
     FeatureClassMapping mapping = new FeatureClassMapping();
-    mapping.baseName = baseName != null ? baseName : DEFAULT_BASE_NAME;
+    if (mapping.baseName != null) {
+      mapping.baseName = baseName;
+    }
     for (FeatureJar featureJar : featureJars) {
       Path jarPath = Paths.get(featureJar.getJar());
       ArchiveClassFileProvider provider = new ArchiveClassFileProvider(jarPath);