summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2013-06-17 14:22:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-17 14:22:59 +0000
commitff5024fbae27da5533a41512dff8af55a8612390 (patch)
tree80013b0d7fb65683d05bc73c67d369cb47048e5f
parentf1bbfdc23a11ae3b2976ecb7d455942c738696c0 (diff)
parent910a7a4d5b89d12ec813196d076a237c1aaa57da (diff)
downloadplatform_tools_swt-ff5024fbae27da5533a41512dff8af55a8612390.tar.gz
platform_tools_swt-ff5024fbae27da5533a41512dff8af55a8612390.tar.bz2
platform_tools_swt-ff5024fbae27da5533a41512dff8af55a8612390.zip
Merge "Add traceview IJ module"
-rw-r--r--.idea/modules.xml1
-rw-r--r--.idea/runConfigurations/traceview.xml18
-rw-r--r--traceview/traceview.iml19
3 files changed, 38 insertions, 0 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1812d6e..67b78d5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -13,6 +13,7 @@
<module fileurl="file://$PROJECT_DIR$/sdkstats/sdkstats.iml" filepath="$PROJECT_DIR$/sdkstats/sdkstats.iml" />
<module fileurl="file://$PROJECT_DIR$/sdkmanager/sdkuilib/sdkuilib.iml" filepath="$PROJECT_DIR$/sdkmanager/sdkuilib/sdkuilib.iml" />
<module fileurl="file://$PROJECT_DIR$/swtmenubar/swtmenubar.iml" filepath="$PROJECT_DIR$/swtmenubar/swtmenubar.iml" />
+ <module fileurl="file://$PROJECT_DIR$/traceview/traceview.iml" filepath="$PROJECT_DIR$/traceview/traceview.iml" />
</modules>
</component>
</project>
diff --git a/.idea/runConfigurations/traceview.xml b/.idea/runConfigurations/traceview.xml
new file mode 100644
index 0000000..f98c063
--- /dev/null
+++ b/.idea/runConfigurations/traceview.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="traceview" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" value="com.android.traceview.MainWindow" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="/path/to/dalvik.trace" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="traceview" />
+ <envs />
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method />
+ </configuration>
+</component> \ No newline at end of file
diff --git a/traceview/traceview.iml b/traceview/traceview.iml
new file mode 100644
index 0000000..1da938e
--- /dev/null
+++ b/traceview/traceview.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="swt" level="project" />
+ <orderEntry type="module" module-name="sdkstats" />
+ <orderEntry type="library" name="org-eclipse-core-commands-3.6.0" level="project" />
+ <orderEntry type="library" name="org-eclipse-equinox-common-3.6.0" level="project" />
+ <orderEntry type="library" name="org-eclipse-jface-3.6.2" level="project" />
+ <orderEntry type="module" module-name="common" />
+ </component>
+</module>
+