Skip to content

Commit f59d908

Browse files
mcsongmcsong
committed
Updated build scripts
1 parent 7a6904c commit f59d908

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎Demo/Demo.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,6 @@
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7466
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -79,6 +71,14 @@
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

‎Demo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
*/
1010

1111
android {
12-
compileSdkVersion 23
12+
compileSdkVersion 24
1313
buildToolsVersion "24.0.0"
1414

1515
defaultConfig {

‎Library/Library.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />

0 commit comments

Comments
 (0)