diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-25 00:15:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 00:15:44 +0000 |
| commit | 693236b367050f40b02ab22991d30eb260ec53ea (patch) | |
| tree | 45a6a0398c74bc4cb38e0cbe7d61e66c4cae9e67 /tools/layoutlib | |
| parent | 83ba89e94a0ae81875d62666cc67e9f5a357d7ea (diff) | |
| parent | c263a07a55a9806147304a1420ceec2d27a6b49d (diff) | |
| download | frameworks_base-693236b367050f40b02ab22991d30eb260ec53ea.zip frameworks_base-693236b367050f40b02ab22991d30eb260ec53ea.tar.gz frameworks_base-693236b367050f40b02ab22991d30eb260ec53ea.tar.bz2 | |
am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit 'c263a07a55a9806147304a1420ceec2d27a6b49d':
Update JRE for runConfigurations.
Diffstat (limited to 'tools/layoutlib')
3 files changed, 35 insertions, 12 deletions
diff --git a/tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml b/tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml index f965ba7..d97d82c 100644 --- a/tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml +++ b/tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml @@ -1,14 +1,14 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="All in bridge" type="JUnit" factoryName="JUnit" singleton="true" nameIsGenerated="true"> + <configuration default="false" name="All in bridge" type="JUnit" factoryName="JUnit" singleton="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="bridge" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> + <option name="ALTERNATIVE_JRE_PATH" value="1.7" /> <option name="PACKAGE_NAME" value="" /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="package" /> - <option name="VM_PARAMETERS" value="-ea -Dtest_res.dir="$PROJECT_DIR$/bridge/tests/res"" /> + <option name="VM_PARAMETERS" value="-ea" /> <option name="PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> @@ -18,13 +18,7 @@ </option> <envs /> <patterns /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="true" /> - </RunnerSettings> <RunnerSettings RunnerId="Run" /> - <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> diff --git a/tools/layoutlib/.idea/runConfigurations/Bridge_quick.xml b/tools/layoutlib/.idea/runConfigurations/Bridge_quick.xml new file mode 100644 index 0000000..4f0eb8d --- /dev/null +++ b/tools/layoutlib/.idea/runConfigurations/Bridge_quick.xml @@ -0,0 +1,29 @@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="Bridge quick" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="bridge" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" value="" /> + <option name="METHOD_NAME" value="" /> + <option name="TEST_OBJECT" value="pattern" /> + <option name="VM_PARAMETERS" value="-ea" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns> + <pattern testClass="com.android.layoutlib.bridge.TestDelegates" /> + <pattern testClass="android.graphics.Matrix_DelegateTest" /> + <pattern testClass="com.android.layoutlib.bridge.android.BridgeXmlBlockParserTest" /> + </patterns> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> +</component>
\ No newline at end of file diff --git a/tools/layoutlib/.idea/runConfigurations/Create.xml b/tools/layoutlib/.idea/runConfigurations/Create.xml index fb0b866..ff173e5 100644 --- a/tools/layoutlib/.idea/runConfigurations/Create.xml +++ b/tools/layoutlib/.idea/runConfigurations/Create.xml @@ -5,8 +5,8 @@ <option name="VM_PARAMETERS" value="" /> <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> - <option name="ALTERNATIVE_JRE_PATH" value="1.6" /> + <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" /> |