diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-14 22:18:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 22:18:33 +0000 |
| commit | a8545890ac7851dbd113535e14d170e083357f5b (patch) | |
| tree | 495d89c3dc66380a1242b2f063db0cccc16c8a8a | |
| parent | 474bb82fd5dafdba8de917ed7a834ba68890678f (diff) | |
| parent | fc41c2c02e9092d21e10fcc38a928d26d9f05a4e (diff) | |
| download | frameworks_base-a8545890ac7851dbd113535e14d170e083357f5b.zip frameworks_base-a8545890ac7851dbd113535e14d170e083357f5b.tar.gz frameworks_base-a8545890ac7851dbd113535e14d170e083357f5b.tar.bz2 | |
Merge "Move couple of intellij libraries to project level." into mnc-dev
| -rw-r--r-- | tools/layoutlib/.idea/libraries/framework_jar.xml | 13 | ||||
| -rw-r--r-- | tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml | 11 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/bridge.iml | 26 |
3 files changed, 26 insertions, 24 deletions
diff --git a/tools/layoutlib/.idea/libraries/framework_jar.xml b/tools/layoutlib/.idea/libraries/framework_jar.xml new file mode 100644 index 0000000..6695a36 --- /dev/null +++ b/tools/layoutlib/.idea/libraries/framework_jar.xml @@ -0,0 +1,13 @@ +<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 diff --git a/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml b/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml new file mode 100644 index 0000000..a873600 --- /dev/null +++ b/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml @@ -0,0 +1,11 @@ +<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 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> |