aboutsummaryrefslogtreecommitdiffstats
path: root/lint
diff options
context:
space:
mode:
Diffstat (limited to 'lint')
-rw-r--r--lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java
index 306e6a2..3163a6c 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java
@@ -154,7 +154,11 @@ public class ApiLookup {
if (cacheDir == null) {
cacheDir = xmlFile.getParentFile();
}
- File binaryData = new File(cacheDir, name + ".bin");
+
+ File binaryData = new File(cacheDir, name
+ // Incorporate version number in the filename to avoid upgrade filename
+ // conflicts on Windows (such as issue #26663)
+ + "-" + BINARY_FORMAT_VERSION + ".bin"); //$NON-NLS-1$ //$NON-NLS-2$
if (DEBUG_FORCE_REGENERATE_BINARY) {
System.err.println("\nTemporarily regenerating binary data unconditionally \nfrom "