commit fc41c2c02e9092d21e10fcc38a928d26d9f05a4e
author Deepanshu Gupta <deepanshu@google.com> Thu May 14 15:12:57 2015 -0700
committer Deepanshu Gupta <deepanshu@google.com> Thu May 14 15:12:57 2015 -0700
tree 8e62ca29615411344ee000b6ec5849720d3d0882
parent 4ebbfd778790d4d4fb4c1ac4cee98edb4475bd3d

Move couple of intellij libraries to project level.

Move framework and layoutlib api libraries back to being project
libraries so that other modules can depend on it. This enables custom
widget libraries project to merge through cleanly.

Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f

tools/layoutlib/bridge/bridge.iml

diff --git a/tools/layoutlib/bridge/bridge.iml b/tools/layoutlib/bridge/bridge.iml
index d2b1259..af2fe7f 100644
--- a/tools/layoutlib/bridge/bridge.iml
+++ b/tools/layoutlib/bridge/bridge.iml
@@ -24,17 +24,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="layoutlib_api-prebuilt">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../prebuilts/misc/common/layoutlib_api/layoutlib_api-prebuilt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../prebuilts/misc/common/layoutlib_api/layoutlib_api-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="layoutlib_api-prebuilt" level="project" />
     <orderEntry type="module-library">
       <library name="ninepatch-prebuilt">
         <CLASSES>
@@ -60,19 +50,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="framework.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../../core/java" />
-          <root url="file://$MODULE_DIR$/../../../graphics/java" />
-          <root url="file://$MODULE_DIR$/../../../../../libcore/luni/src/main/java" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="framework.jar" level="project" />
     <orderEntry type="module-library" scope="TEST">
       <library name="kxml2-2.3.0">
         <CLASSES>