diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-05-06 19:12:04 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-05-06 19:12:04 -0700 |
| commit | 628645f131b04878e6a4c53c3961d2c086d92247 (patch) | |
| tree | 8b339db12bf1146262c4f86623fd2087fb01cf5a | |
| parent | 6f8df70cecc5ab23922a0d7989536f7e01d827e5 (diff) | |
| download | idea-628645f131b04878e6a4c53c3961d2c086d92247.tar.gz | |
Update for idea/135.815 android plugin merge
Change-Id: I667c2680e4a219b63dc92ed2c1c11af77b8f1077
| -rw-r--r-- | .idea/modules.xml | 1 | ||||
| -rw-r--r-- | build/scripts/layouts.gant | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 3b9fb09a0a31..19385b25b6dd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -15,7 +15,6 @@ <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/android.iml" filepath="$PROJECT_DIR$/../adt/idea/android/android.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/common/android-common.iml" filepath="$PROJECT_DIR$/../adt/idea/android/common/android-common.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android-designer/android-designer.iml" filepath="$PROJECT_DIR$/../adt/idea/android-designer/android-designer.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/android-gradle-jps/android-gradle-jps.iml" filepath="$PROJECT_DIR$/../adt/idea/android-gradle-jps/android-gradle-jps.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/../adt/idea/android/jps-plugin/android-jps-plugin.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/../adt/idea/android/rt/android-rt.iml" group="plugins/Android" /> diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index e59742577a6f..bc37da8f3f43 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -762,14 +762,6 @@ def layoutAndroid() { } } } - - dir("android-designer") { - dir("lib") { - jar("android-designer.jar") { - module("android-designer") - } - } - } } } |