Merge remote-tracking branch 'remotes/origin/merge13' (android)
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Tue, 18 Aug 2015 12:47:25 +0000 (15:47 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Tue, 18 Aug 2015 12:47:25 +0000 (15:47 +0300)
1  2 
.idea/modules.xml
community-tests/src/tests/testGroups.properties

diff --combined .idea/modules.xml
index 511826b57974cb87a28d07645a82bf1e693f4abe,5047a1c7d30f760966d0e8482ef9453851c0c99a..6918ab2c7be6cba8e1a74037885e68575de2b0eb
        <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
+       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" group="android/sdktools" />
+       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" group="android/sdktools" />
        <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" filepath="$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/built-in-server-api/built-in-server-api.iml" filepath="$PROJECT_DIR$/platform/built-in-server-api/built-in-server-api.iml" group="platform" />
+       <module fileurl="file://$PROJECT_DIR$/android/tools-base/chartlib/chartlib.iml" filepath="$PROJECT_DIR$/android/tools-base/chartlib/chartlib.iml" group="android/sdktools" />
        <module fileurl="file://$PROJECT_DIR$/colorSchemes/colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/colorSchemes.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/plugins/commander/commander.iml" filepath="$PROJECT_DIR$/plugins/commander/commander.iml" group="plugins" />
        <module fileurl="file://$PROJECT_DIR$/android/tools-base/common/common.iml" filepath="$PROJECT_DIR$/android/tools-base/common/common.iml" group="android/sdktools" />
        <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" />
        <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" />
        <module fileurl="file://$PROJECT_DIR$/python/rest/rest.iml" filepath="$PROJECT_DIR$/python/rest/rest.iml" group="python" />
+       <module fileurl="file://$PROJECT_DIR$/android/tools-base/rpclib/rpclib.iml" filepath="$PROJECT_DIR$/android/tools-base/rpclib/rpclib.iml" group="android/sdktools" />
        <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" filepath="$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" group="platform/script-debugger" />
        <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" filepath="$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" group="platform/script-debugger" />
        <module fileurl="file://$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" filepath="$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" group="android/sdktools" />
        <module fileurl="file://$PROJECT_DIR$/platform/usageView/usageView.iml" filepath="$PROJECT_DIR$/platform/usageView/usageView.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/util/util.iml" filepath="$PROJECT_DIR$/platform/util/util.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/util-rt/util-rt.iml" filepath="$PROJECT_DIR$/platform/util-rt/util-rt.iml" group="platform" />
 +      <module fileurl="file://$PROJECT_DIR$/platform/util/testSrc/util-tests.iml" filepath="$PROJECT_DIR$/platform/util/testSrc/util-tests.iml" />
        <module fileurl="file://$PROJECT_DIR$/platform/vcs-api/vcs-api.iml" filepath="$PROJECT_DIR$/platform/vcs-api/vcs-api.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/vcs-api/vcs-api-core/vcs-api-core.iml" filepath="$PROJECT_DIR$/platform/vcs-api/vcs-api-core/vcs-api-core.iml" group="platform" />
        <module fileurl="file://$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" group="platform" />
index 9402c64e973a426b99bbff16e99a073ecedb839d,86295d76aa04dd140aebf4f9092bb9dbf6407e9c..736f52634df3837951f6b91d3e3f36f95b23d4d5
@@@ -15,7 -15,6 +15,7 @@@ com.android.ide.common.
  com.android.sdklib.*
  com.android.tools.lint.*
  com.android.tools.gradle.*
 +com.android.tools.perflib.*
  com.android.utils.*
  com.android.ddmlib.*
  com.android.resources.*
@@@ -51,6 -50,7 +51,7 @@@ com.android.tools.idea.wizard.TemplateW
  com.android.tools.idea.wizard.TemplateWizardModuleBuilderTest
  com.android.tools.idea.wizard.NewTemplateObjectWizardTest
  org.jetbrains.android.run.AndroidRunConfigurationTest
+ org.jetbrains.android.run.GradleApkProviderTest
  org.jetbrains.android.facet.IdeaSourceProviderTest
  com.android.tools.idea.gradle.service.resolve.AndroidResolveTest
  com.android.tools.idea.gradle.service.resolve.AndroidDslContributorTest
@@@ -71,6 -71,23 +72,23 @@@ com.android.tools.idea.welcome.FirstRun
  com.android.tools.idea.welcome.InstallComponentsTest
  com.android.tools.idea.welcome.AndroidVirtualDeviceTest
  com.android.tools.idea.wizard.ConfigureAndroidModuleStepDynamicTest
+ com.android.tools.idea.editors.AndroidGeneratedSourcesFilterTest
+ com.android.tools.idea.editors.theme.ThemeEditorStyleTest
+ com.android.tools.idea.editors.theme.ThemeEditorUtilsTest
+ com.android.tools.idea.editors.theme.qualifiers.QualifierUtilsTest
+ com.android.tools.idea.gradle.IdeaAndroidProjectTest
+ com.android.tools.idea.gradle.project.GradleProjectSyncDataTest
+ com.android.tools.idea.npw.ConfigureAndroidModuleStepTest
+ com.android.tools.idea.npw.ConfigureAndroidModuleStepDynamicTest
+ com.android.tools.idea.npw.NewModuleWizardStateTest
+ com.android.tools.idea.npw.NewProjectWizardTest
+ com.android.tools.idea.npw.NewTemplateObjectWizardTest
+ com.android.tools.idea.npw.TemplateWizardModuleBuilderTest
+ com.android.tools.idea.npw.WrapArchiveWizardPathTest
+ com.android.tools.idea.sdk.IdeSdksTest
+ com.android.tools.idea.welcome.wizard.FirstRunWizardTest
+ com.android.tools.idea.wizard.template.TemplateWizardStateTest
+ com.android.tools.swing.layoutlib.GraphicsLayoutRendererTest
  
  [ANDROID_BOMBED]
  com.android.tools.idea.gradle.project.GradleModuleImportTest