diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java index a8aada3c883f..91c6b2e569d0 100644 --- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java +++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java @@ -46,6 +46,10 @@ class AndroidJpsUtil { return "jar".equals(ext) || "class".equals(ext); } }; + @NonNls public static final String GENERATED_AIDL_DIR_NAME = "generated-aidl"; + @NonNls public static final String GENERATED_RENDER_SCRIPT_DIR_NAME = "generated-rs"; + @NonNls public static final String GENERATED_RESOURCES_DIR_NAME = "generated-resources"; + @NonNls public static final String GENERATED_AAPT_DIR_NAME = "generated-aapt"; private AndroidJpsUtil() { } diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java index 8a7068105be8..af567cd053b0 100644 --- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java +++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java @@ -147,7 +147,7 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder { continue; } final File outputDirectory = moduleData.getOutputDirectory(); - final File aidlOutputDirectory = new File(outputDirectory, "generated-aidl"); + final File aidlOutputDirectory = new File(outputDirectory, AndroidJpsUtil.GENERATED_AIDL_DIR_NAME); final IAndroidTarget target = moduleData.getAndroidTarget(); try { @@ -210,8 +210,8 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder { } final File outputDirectory = moduleData.getOutputDirectory(); - final File rsOutputDirectory = new File(outputDirectory, "generated-rs"); - final File generatedResourcesDir = new File(outputDirectory, "generated-resources"); + final File rsOutputDirectory = new File(outputDirectory, AndroidJpsUtil.GENERATED_RENDER_SCRIPT_DIR_NAME); + final File generatedResourcesDir = new File(outputDirectory, AndroidJpsUtil.GENERATED_RESOURCES_DIR_NAME); final IAndroidTarget target = moduleData.getAndroidTarget(); final String sdkLocation = moduleData.getSdkLocation(); @@ -312,7 +312,7 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder { } } final File outputDirectory = moduleData.getOutputDirectory(); - final File aptOutputDirectory = new File(outputDirectory, "generated-aapt"); + final File aptOutputDirectory = new File(outputDirectory, AndroidJpsUtil.GENERATED_AAPT_DIR_NAME); if (aptOutputDirectory.exists()) { // clear directory, because it may contain obsolete files (ex. if package name was changed)