diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-04-06 18:19:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-04-06 18:19:31 +0000 |
| commit | 90a1e093775bf0b5f1abb33aeda94c2e91b634ac (patch) | |
| tree | ec6ebaadbc4b6b56d9d17b849cf93691e710468d | |
| parent | 6215837b0c7d749bfa55c07d810747da4c48716e (diff) | |
| parent | 80cd169c8e5afbf7cfd1e867711cfc8ebc75daea (diff) | |
| download | swt-90a1e093775bf0b5f1abb33aeda94c2e91b634ac.tar.gz | |
Merge "Fix project structure." into studio-1.3-dev
automerge: 80cd169
* commit '80cd169c8e5afbf7cfd1e867711cfc8ebc75daea':
Fix project structure.
| -rw-r--r-- | .idea/libraries/intellij_annotations.xml | 11 | ||||
| -rw-r--r-- | hierarchyviewer2/app/hierarchyviewer2.iml | 2 | ||||
| -rw-r--r-- | sdkmanager/app/sdkmanager.iml | 2 | ||||
| -rw-r--r-- | sdkmanager/sdkuilib/sdkuilib.iml | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/.idea/libraries/intellij_annotations.xml b/.idea/libraries/intellij_annotations.xml new file mode 100644 index 0000000..5c70ad3 --- /dev/null +++ b/.idea/libraries/intellij_annotations.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="intellij-annotations"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/intellij/annotations/12.0/annotations-12.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/intellij/annotations/12.0/annotations-12.0-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/hierarchyviewer2/app/hierarchyviewer2.iml b/hierarchyviewer2/app/hierarchyviewer2.iml index 1c18976..d399cc6 100644 --- a/hierarchyviewer2/app/hierarchyviewer2.iml +++ b/hierarchyviewer2/app/hierarchyviewer2.iml @@ -11,7 +11,7 @@ <orderEntry type="module" module-name="ddmuilib" /> <orderEntry type="module" module-name="hierarchyviewer2lib" /> <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="sdklib" /> + <orderEntry type="module" module-name="sdklib-base" /> <orderEntry type="module" module-name="swtmenubar" /> </component> </module> diff --git a/sdkmanager/app/sdkmanager.iml b/sdkmanager/app/sdkmanager.iml index fc47d78..af5bc26 100644 --- a/sdkmanager/app/sdkmanager.iml +++ b/sdkmanager/app/sdkmanager.iml @@ -9,7 +9,7 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="swt" level="project" /> - <orderEntry type="module" module-name="sdklib" /> + <orderEntry type="module" module-name="sdklib-base" /> <orderEntry type="module" module-name="sdkuilib" /> </component> </module> diff --git a/sdkmanager/sdkuilib/sdkuilib.iml b/sdkmanager/sdkuilib/sdkuilib.iml index 05feb5d..82f1ce5 100644 --- a/sdkmanager/sdkuilib/sdkuilib.iml +++ b/sdkmanager/sdkuilib/sdkuilib.iml @@ -10,7 +10,7 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="swtmenubar" /> - <orderEntry type="module" module-name="sdklib" /> + <orderEntry type="module" module-name="sdklib-base" /> <orderEntry type="library" name="swt" level="project" /> <orderEntry type="library" name="org-eclipse-jface-3.6.2" level="project" /> <orderEntry type="library" name="org-eclipse-core-commands-3.6.0" level="project" /> |