Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc41c2c0 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

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
parent 4ebbfd77

tools/layoutlib/.idea/libraries/framework_jar.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="framework.jar">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/../../../../out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="file://$PROJECT_DIR$/../../core/java" />

      <root url="file://$PROJECT_DIR$/../../graphics/java" />

      <root url="file://$PROJECT_DIR$/../../../../libcore/luni/src/main/java" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="layoutlib_api-prebuilt">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/layoutlib_api/layoutlib_api-prebuilt.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/layoutlib_api/layoutlib_api-sources.jar!/" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/bridge/bridge.iml

+2 −24
Original line number Diff line number Diff line
@@ -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>