Reserve 'by' in minifier to prevent accidental imports
Change-Id: Ia4eb2c80b2272faaa4bcbb24d39dfba53834d1f7
diff --git a/src/main/java/com/android/tools/r8/naming/Minifier.java b/src/main/java/com/android/tools/r8/naming/Minifier.java
index 3bc7392..1ba7556 100644
--- a/src/main/java/com/android/tools/r8/naming/Minifier.java
+++ b/src/main/java/com/android/tools/r8/naming/Minifier.java
@@ -5,7 +5,7 @@
import static com.android.tools.r8.graph.DexApplication.classesWithDeterministicOrder;
import static com.android.tools.r8.utils.StringUtils.EMPTY_CHAR_ARRAY;
-import static com.android.tools.r8.utils.SymbolGenerationUtils.PRIMITIVE_TYPE_NAMES;
+import static com.android.tools.r8.utils.SymbolGenerationUtils.RESERVED_NAMES;
import com.android.tools.r8.errors.CompilationError;
import com.android.tools.r8.graph.AppView;
@@ -132,7 +132,7 @@
SymbolGenerationUtils.numberToIdentifier(state.incrementNameIndex(), mixedCasing);
} while (obfuscationDictionaryForLookup.contains(nextString));
}
- } while (PRIMITIVE_TYPE_NAMES.contains(nextString));
+ } while (RESERVED_NAMES.contains(nextString));
nextName.append(nextString);
return nextName.toString();
}
diff --git a/src/main/java/com/android/tools/r8/utils/SymbolGenerationUtils.java b/src/main/java/com/android/tools/r8/utils/SymbolGenerationUtils.java
index 3729ead..ea895e9 100644
--- a/src/main/java/com/android/tools/r8/utils/SymbolGenerationUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/SymbolGenerationUtils.java
@@ -17,9 +17,9 @@
DONT_USE_MIXED_CASE
}
- public static Set<String> PRIMITIVE_TYPE_NAMES =
+ public static Set<String> RESERVED_NAMES =
Sets.newHashSet(
- "boolean", "byte", "char", "double", "float", "int", "long", "short", "void", "it");
+ "boolean", "byte", "char", "double", "float", "int", "long", "short", "void", "it", "by");
// These letters are used not creating fresh names to output and not for parsing dex/class files.
private static final char[] IDENTIFIER_CHARACTERS =
