Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
Alexey Pelykh 2015-02-02 17:54:43 +02:00
parent 30398fad48
commit 6d6d3631f3
5 changed files with 20 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
OsmAnd-java/OsmAnd-java.iml
View file

@ -1,107 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/libs/bsh-core-2.0b4.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/bzip2-20090327.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/commons-logging-1.1.1.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/json-20090211.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/junidecode-0.1.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/kxml2-2.3.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/tuprolog.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/icu4j-49_1.jar!/" />
<libelement value="jar://$MODULE_DIR$/libs/gnu-trove-osmand.jar!/" />
<src_description expected_position="0">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
</src_description>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
<orderEntry type="module-library">
<library name="bsh-core-2.0b4.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/bsh-core-2.0b4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="bzip2-20090327.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/bzip2-20090327.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="commons-logging-1.1.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="json-20090211.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/json-20090211.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junidecode-0.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/junidecode-0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="kxml2-2.3.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/kxml2-2.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="tuprolog.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/tuprolog.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="icu4j-49_1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/icu4j-49_1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="gnu-trove-osmand.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/gnu-trove-osmand.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

13
OsmAnd-java/build.gradle
View file

@ -1,15 +1,20 @@
apply plugin: 'java' apply plugin: 'java'
jar { sourceSets {
sourceSets {
main { main {
java { java {
srcDirs = ["src"] srcDirs = [
} "src"
]
} }
} }
} }
// This is Android-specific
jar {
exclude "**/PlatformUtil.*"
}
dependencies { dependencies {
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
} }

23
OsmAnd/build.gradle Executable file → Normal file
View file

@ -73,30 +73,18 @@ android {
jni.srcDirs = [] jni.srcDirs = []
jniLibs.srcDirs = ["libs"] jniLibs.srcDirs = ["libs"]
aidl.srcDirs = ["src"] aidl.srcDirs = ["src"]
java.srcDirs = [ java.srcDirs = ["src"]
"src", resources.srcDirs = ["src"]
fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java")
]
resources.srcDirs = [
"src"
]
renderscript.srcDirs = ["src"] renderscript.srcDirs = ["src"]
res.srcDirs = [ res.srcDirs = ["res"]
'res' assets.srcDirs = ["assets"]
]
assets.srcDirs = [
'assets'
]
} }
free { free {
manifest.srcFile "AndroidManifest-free.xml" manifest.srcFile "AndroidManifest-free.xml"
} }
legacy { legacy {
jniLibs.srcDirs = [ jniLibs.srcDirs = ["libgnustl"]
"libgnustl"
]
} }
} }
@ -311,6 +299,7 @@ repositories {
} }
dependencies { dependencies {
compile project(":OsmAnd-java")
compile fileTree( compile fileTree(
dir: "libs", dir: "libs",
include: ["*.jar"], include: ["*.jar"],

2
build.gradle
View file

@ -1,5 +1,3 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()

1
settings.gradle
View file

@ -1 +1,2 @@
include ':OsmAnd' include ':OsmAnd'
include ':OsmAnd-java'