Skip to content

Commit a32c0d1

Browse files
committed
fix conflict
2 parents 479f664 + 10bc5ef commit a32c0d1

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

.classpath

+5
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
55
<classpathentry kind="src" path="gen"/>
66
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry kind="src" path="src"/>
8+
<classpathentry kind="src" path="gen"/>
9+
<classpathentry kind="lib" path="libs/android-support-v7-recyclerview.jar"/>
10+
<classpathentry kind="lib" path="libs/android-support-v7-appcompat.jar"/>
11+
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
712
<classpathentry kind="output" path="bin/classes"/>
813
</classpath>

build.gradle

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
apply plugin: 'com.android.library'
2+
3+
dependencies {
4+
compile fileTree(dir: 'libs', include: '*.jar')
5+
}
6+
7+
android {
8+
compileSdkVersion 21
9+
buildToolsVersion "22.0.1"
10+
11+
sourceSets {
12+
main {
13+
manifest.srcFile 'AndroidManifest.xml'
14+
java.srcDirs = ['src']
15+
resources.srcDirs = ['src']
16+
aidl.srcDirs = ['src']
17+
renderscript.srcDirs = ['src']
18+
res.srcDirs = ['res']
19+
assets.srcDirs = ['assets']
20+
}
21+
22+
// Move the tests to tests/java, tests/res, etc...
23+
instrumentTest.setRoot('tests')
24+
25+
// Move the build types to build-types/<type>
26+
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
27+
// This moves them out of them default location under src/<type>/... which would
28+
// conflict with src/ being used by the main source set.
29+
// Adding new build types or product flavors should be accompanied
30+
// by a similar customization.
31+
debug.setRoot('build-types/debug')
32+
release.setRoot('build-types/release')
33+
}
34+
}

libs/android-support-v4.jar

184 KB
Binary file not shown.

0 commit comments

Comments
 (0)