|
8 | 8 | </facet> |
9 | 9 | <facet type="android" name="Android"> |
10 | 10 | <configuration> |
11 | | - <option name="SELECTED_BUILD_VARIANT" value="normalDebug" /> |
| 11 | + <option name="SELECTED_BUILD_VARIANT" value="debug" /> |
12 | 12 | <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> |
13 | | - <option name="ASSEMBLE_TASK_NAME" value="assembleNormalDebug" /> |
14 | | - <option name="COMPILE_JAVA_TASK_NAME" value="compileNormalDebugSources" /> |
15 | | - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNormalDebugAndroidTest" /> |
16 | | - <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNormalDebugAndroidTestSources" /> |
| 13 | + <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> |
| 14 | + <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> |
| 15 | + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> |
| 16 | + <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> |
17 | 17 | <afterSyncTasks> |
18 | | - <task>generateNormalDebugAndroidTestSources</task> |
19 | | - <task>generateNormalDebugSources</task> |
| 18 | + <task>generateDebugAndroidTestSources</task> |
| 19 | + <task>generateDebugSources</task> |
20 | 20 | </afterSyncTasks> |
21 | 21 | <option name="ALLOW_USER_CONFIGURATION" value="false" /> |
22 | 22 | <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> |
|
27 | 27 | </facet> |
28 | 28 | </component> |
29 | 29 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> |
30 | | - <output url="file://$MODULE_DIR$/build/intermediates/classes/normal/debug" /> |
| 30 | + <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> |
31 | 31 | <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> |
32 | 32 | <exclude-output /> |
33 | 33 | <content url="file://$MODULE_DIR$"> |
34 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/normal/debug" isTestSource="false" generated="true" /> |
35 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/normal/debug" isTestSource="false" generated="true" /> |
36 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/debug" isTestSource="false" generated="true" /> |
37 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/normal/debug" isTestSource="false" generated="true" /> |
38 | | - <sourceFolder url="file://$MODULE_DIR$/build/intermediates/fabric/res/normal/debug" type="java-resource" /> |
39 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/debug" type="java-resource" /> |
40 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/debug" type="java-resource" /> |
41 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/res" type="java-resource" /> |
42 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/resources" type="java-resource" /> |
43 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/assets" type="java-resource" /> |
44 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/aidl" isTestSource="false" /> |
45 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/java" isTestSource="false" /> |
46 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/jni" isTestSource="false" /> |
47 | | - <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/rs" isTestSource="false" /> |
48 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/normal/debug" isTestSource="true" generated="true" /> |
49 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/normal/debug" isTestSource="true" generated="true" /> |
50 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/normal/debug" isTestSource="true" generated="true" /> |
51 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/normal/debug" isTestSource="true" generated="true" /> |
52 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/normal/debug" type="java-test-resource" /> |
53 | | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/normal/debug" type="java-test-resource" /> |
54 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/res" type="java-resource" /> |
55 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/resources" type="java-resource" /> |
56 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/assets" type="java-resource" /> |
57 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/aidl" isTestSource="false" /> |
58 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/java" isTestSource="false" /> |
59 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/jni" isTestSource="false" /> |
60 | | - <sourceFolder url="file://$MODULE_DIR$/src/normal/rs" isTestSource="false" /> |
61 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/res" type="java-test-resource" /> |
62 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/resources" type="java-test-resource" /> |
63 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/assets" type="java-test-resource" /> |
64 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/aidl" isTestSource="true" /> |
65 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/java" isTestSource="true" /> |
66 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/jni" isTestSource="true" /> |
67 | | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/rs" isTestSource="true" /> |
| 34 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> |
| 35 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> |
| 36 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> |
| 37 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> |
| 38 | + <sourceFolder url="file://$MODULE_DIR$/build/intermediates/fabric/res/debug" type="java-resource" /> |
| 39 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> |
| 40 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> |
| 41 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> |
| 42 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> |
| 43 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> |
| 44 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> |
| 45 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> |
| 46 | + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> |
68 | 47 | <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> |
69 | 48 | <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> |
70 | 49 | <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> |
|
103 | 82 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.8/jars" /> |
104 | 83 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/fabric" /> |
105 | 84 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> |
| 85 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" /> |
| 86 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" /> |
| 87 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" /> |
| 88 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" /> |
106 | 89 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> |
107 | 90 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> |
108 | 91 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> |
| 92 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" /> |
109 | 93 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> |
| 94 | + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" /> |
110 | 95 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> |
111 | 96 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> |
112 | 97 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> |
|
0 commit comments