diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-14 15:12:57 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2015-05-14 15:12:57 -0700 |
| commit | fc41c2c02e9092d21e10fcc38a928d26d9f05a4e (patch) | |
| tree | 8e62ca29615411344ee000b6ec5849720d3d0882 /tools | |
| parent | 4ebbfd778790d4d4fb4c1ac4cee98edb4475bd3d (diff) | |
| download | frameworks_base-fc41c2c02e9092d21e10fcc38a928d26d9f05a4e.zip frameworks_base-fc41c2c02e9092d21e10fcc38a928d26d9f05a4e.tar.gz frameworks_base-fc41c2c02e9092d21e10fcc38a928d26d9f05a4e.tar.bz2 | |
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
Diffstat (limited to 'tools')
| -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> |