From 5944fccd36a17fba66004bdf3e820b55082bb1b3 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Wed, 8 Jun 2016 19:28:22 +0300 Subject: [PATCH] Fix idea dependency error. On dependency changes in File -> Project structure... I get following errors (for 3 projects): {% for project in ['Osmand', 'Osmand-SRTMPlugin', 'Osmand-ParkingPlugin'] %} Module "{{ project }}" must not contain source root "~/osmand/android/plugins/{{ project }}/src". The root already belongs to module "{{ project }}" {% endfor %} This is due duplicate lines in "{{ project }}.iml" file that is generated based on "build.gradle" files. This commit fixes this situation. --- OsmAnd/build.gradle | 1 - plugins/Osmand-ParkingPlugin/build.gradle | 1 - plugins/Osmand-SRTMPlugin/build.gradle | 1 - 3 files changed, 3 deletions(-) diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 49065e3e7f..35deaa0bad 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -68,7 +68,6 @@ android { jniLibs.srcDirs = ["libs"] aidl.srcDirs = ["src"] java.srcDirs = ["src"] - resources.srcDirs = ["src"] renderscript.srcDirs = ["src"] res.srcDirs = ["res"] assets.srcDirs = ["assets"] diff --git a/plugins/Osmand-ParkingPlugin/build.gradle b/plugins/Osmand-ParkingPlugin/build.gradle index d162118597..287150d55f 100644 --- a/plugins/Osmand-ParkingPlugin/build.gradle +++ b/plugins/Osmand-ParkingPlugin/build.gradle @@ -36,7 +36,6 @@ android { jniLibs.srcDirs = [] aidl.srcDirs = ["src"] java.srcDirs = ["src"] - resources.srcDirs = ["src"] renderscript.srcDirs = ["src"] res.srcDirs = ["res"] assets.srcDirs = ["assets"] diff --git a/plugins/Osmand-SRTMPlugin/build.gradle b/plugins/Osmand-SRTMPlugin/build.gradle index 17aa1d99f2..892d058f33 100644 --- a/plugins/Osmand-SRTMPlugin/build.gradle +++ b/plugins/Osmand-SRTMPlugin/build.gradle @@ -36,7 +36,6 @@ android { jniLibs.srcDirs = [] aidl.srcDirs = ["src"] java.srcDirs = ["src"] - resources.srcDirs = ["src"] renderscript.srcDirs = ["src"] res.srcDirs = ["res"] assets.srcDirs = ["assets"]