diff options
| author | Alex Ruiz <alruiz@google.com> | 2014-08-11 11:53:54 -0700 |
|---|---|---|
| committer | Alex Ruiz <alruiz@google.com> | 2014-08-11 11:53:54 -0700 |
| commit | 22a6196e427d3894d7a258fb65f8eb768a6d426f (patch) | |
| tree | 13d31089db918545edbe39285bb5d2e676c8b5ff /android/testData/guiTests | |
| parent | 399aa0efffc8478b4fc49be8859623cbf9c9179d (diff) | |
| download | idea-22a6196e427d3894d7a258fb65f8eb768a6d426f.tar.gz | |
Removed gradle.property files from test projects. Project setup now removes "build" folder before importing project.
Change-Id: I4487b7a0aaa232568a4b570a4abbba6dd6772541
Diffstat (limited to 'android/testData/guiTests')
8 files changed, 4 insertions, 72 deletions
diff --git a/android/testData/guiTests/AarDependency/.gitignore b/android/testData/guiTests/AarDependency/.gitignore index dec2a508cf1..072686df30f 100644 --- a/android/testData/guiTests/AarDependency/.gitignore +++ b/android/testData/guiTests/AarDependency/.gitignore @@ -7,3 +7,4 @@ gradlew gradlew.bat *.iml +gradle.properties diff --git a/android/testData/guiTests/AarDependency/gradle.properties b/android/testData/guiTests/AarDependency/gradle.properties deleted file mode 100644 index 5d08ba75bb9..00000000000 --- a/android/testData/guiTests/AarDependency/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file diff --git a/android/testData/guiTests/CentralBuildDirectory/.gitignore b/android/testData/guiTests/CentralBuildDirectory/.gitignore index 46326953812..9d63b7e1025 100644 --- a/android/testData/guiTests/CentralBuildDirectory/.gitignore +++ b/android/testData/guiTests/CentralBuildDirectory/.gitignore @@ -8,3 +8,4 @@ gradlew gradlew.bat *.iml /central +gradle.properties diff --git a/android/testData/guiTests/CentralBuildDirectory/gradle.properties b/android/testData/guiTests/CentralBuildDirectory/gradle.properties deleted file mode 100644 index 5d08ba75bb9..00000000000 --- a/android/testData/guiTests/CentralBuildDirectory/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file diff --git a/android/testData/guiTests/MultipleModuleTypes/.gitignore b/android/testData/guiTests/MultipleModuleTypes/.gitignore index dec2a508cf1..072686df30f 100644 --- a/android/testData/guiTests/MultipleModuleTypes/.gitignore +++ b/android/testData/guiTests/MultipleModuleTypes/.gitignore @@ -7,3 +7,4 @@ gradlew gradlew.bat *.iml +gradle.properties diff --git a/android/testData/guiTests/MultipleModuleTypes/gradle.properties b/android/testData/guiTests/MultipleModuleTypes/gradle.properties deleted file mode 100644 index 5d08ba75bb9..00000000000 --- a/android/testData/guiTests/MultipleModuleTypes/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file diff --git a/android/testData/guiTests/SimpleApplication/.gitignore b/android/testData/guiTests/SimpleApplication/.gitignore index 633eda8b112..6cb14b0afe6 100644 --- a/android/testData/guiTests/SimpleApplication/.gitignore +++ b/android/testData/guiTests/SimpleApplication/.gitignore @@ -14,3 +14,4 @@ /build gradlew gradlew.bat +gradle.properties diff --git a/android/testData/guiTests/SimpleApplication/gradle.properties b/android/testData/guiTests/SimpleApplication/gradle.properties deleted file mode 100644 index 5d08ba75bb9..00000000000 --- a/android/testData/guiTests/SimpleApplication/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file |