aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2015-07-15 19:36:47 -0700
committerXavier Ducrohet <xav@google.com>2015-07-15 19:36:47 -0700
commitb9c1deacd39a427fcd493504b2be8cf612000f07 (patch)
treec0bc22421d8426f945a122b6abd4a1aea75c08aa
parentd2c177a41f2133a9590411261068d51a06d99657 (diff)
downloadiosched-b9c1deacd39a427fcd493504b2be8cf612000f07.tar.gz
[Benchmark] update to use benchmark gradle files
Change-Id: I83f5f4c45f4dbeaab1100dd0ab9ca531181914d7
-rw-r--r--Wearable/build.gradle24
-rw-r--r--android/build.gradle23
-rw-r--r--build.gradle11
3 files changed, 5 insertions, 53 deletions
diff --git a/Wearable/build.gradle b/Wearable/build.gradle
index d893535..6a78fd9 100644
--- a/Wearable/build.gradle
+++ b/Wearable/build.gradle
@@ -34,30 +34,6 @@ android {
versionCode 1
versionName "1.0"
}
- signingConfigs {
- debug {
- storeFile file(iosched14_android_debugkey_storefile)
- storePassword iosched14_android_debugkey_storePassword
- keyAlias iosched14_android_debugkey_keyAlias
- keyPassword iosched14_android_debugkey_keyPassword
- }
- release {
- storeFile file(iosched14_android_releasekey_storefile)
- storePassword iosched14_android_releasekey_storePassword
- keyAlias iosched14_android_releasekey_keyAlias
- keyPassword iosched14_android_releasekey_keyPassword
- }
- }
-
- buildTypes {
- debug {
- debuggable true
- signingConfig signingConfigs.debug
- }
- release {
- signingConfig signingConfigs.release
- }
- }
lintOptions {
abortOnError false
diff --git a/android/build.gradle b/android/build.gradle
index 6036db7..1b29909 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+apply from: "../../commonHeader.gradle"
+apply from: "../../commonLocalRepo.gradle"
+
apply plugin: 'com.android.application'
repositories {
@@ -32,30 +35,10 @@ android {
targetSdkVersion 21
}
- signingConfigs {
- debug {
- storeFile file("../android/debug.keystore")
- storePassword "android"
- keyAlias "androiddebugkey"
- keyPassword "android"
- }
- release {
- storeFile file("../android/debug.keystore")
- storePassword "android"
- keyAlias "androiddebugkey"
- keyPassword "android"
- }
- }
-
buildTypes {
- debug {
- debuggable true
- signingConfig signingConfigs.debug
- }
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), file('proguard-project.txt')
- signingConfig signingConfigs.release
}
}
diff --git a/build.gradle b/build.gradle
index bf3a80f..0c7a1f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,12 +15,5 @@
*/
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
- }
-}
-
+apply from: "../commonHeader.gradle"
+buildscript { apply from: "../commonBuildScript.gradle", to: buildscript }