From 92faa61cd9b0f00cf1b3a99d413b6f72750d3e9c Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Tue, 23 Dec 2014 11:39:15 -0800 Subject: [PATCH] Bug 1115064 - Fix small errors and make Gradle integration work in Android Studio 1.0.2. r=me The important change here is that we allow the Android-Gradle plugin to be version 0.14.4 or version 1.0.0, which appears to work in IntelliJ 14.0.2 and in Android Studio 1.0.2. Testing feedback came from imjalpreet and garvank. --HG-- extra : rebase_source : 2b93dd91603666f1c6a1d2fe0fa7721d5741bdda --- mobile/android/base/build.gradle | 90 ------------------- mobile/android/gradle/base/build.gradle | 4 - mobile/android/gradle/branding/build.gradle | 4 - mobile/android/gradle/build.gradle | 3 +- .../preprocessed_resources/build.gradle | 4 - mobile/android/gradle/thirdparty/build.gradle | 4 - mobile/android/mach_commands.py | 1 - 7 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 mobile/android/base/build.gradle diff --git a/mobile/android/base/build.gradle b/mobile/android/base/build.gradle deleted file mode 100644 index 6468135f6b1..00000000000 --- a/mobile/android/base/build.gradle +++ /dev/null @@ -1,90 +0,0 @@ -project.buildDir = "${topobjdir}/mobile/android/gradle/base/build" - -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - defaultConfig { - applicationId 'org.mozilla.gecko' - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - } - - buildTypes { - release { - minifyEnabled false - proguardFile getDefaultProguardFile('proguard-android.txt') - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - android { - lintOptions { - abortOnError false - } - } - - sourceSets { - main { - manifest { - srcFile 'gradle_AndroidManifest.xml' - } - - java { - // The main sources are symlinked in here. - srcDir "${topobjdir}/mobile/android/gradle/base/src/main/java" - exclude '**/tests/**' - exclude '**/resources/**' - if (!MOZ_CRASHREPORTER) { - exclude '**/CrashReporter.java' - } - srcDir "../search/java" - srcDir "../stumbler/java" - srcDir "${topobjdir}/mobile/android/base/generated" - exclude '**/R.java' - exclude '**/Manifest.java' - } - - res { - srcDir "../branding/unofficial/res" - srcDir "${topobjdir}/mobile/android/base/res" - // The main resources are symlinked in here. - srcDir "${topobjdir}/mobile/android/gradle/base/src/main/res" - if (MOZ_CRASHREPORTER) { - srcDir "crashreporter/res" - } - } - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:19.1.+' - compile 'com.android.support:appcompat-v7:19.1.+' - compile 'com.android.support:mediarouter-v7:19.1.+' - compile 'com.google.android.gms:play-services:5.+' - - compile project(':thirdparty') - compile project(':omnijar') -} - -task generateCodeAndResources(type:Exec) { - workingDir "${topobjdir}" - - commandLine "${topsrcdir}/mach" - args 'build' - args '-C' - args 'mobile/android/base' - args 'gradle-targets' -} - -android.libraryVariants.all { variant -> - variant.checkManifest.dependsOn generateCodeAndResources -} diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle index 1d4d6c99ecc..d0a118a425c 100644 --- a/mobile/android/gradle/base/build.gradle +++ b/mobile/android/gradle/base/build.gradle @@ -3,10 +3,6 @@ apply plugin: 'com.android.library' apply from: "${topsrcdir}/mobile/android/gradle/android.gradle" android { - defaultConfig { - applicationId 'org.mozilla.gecko' - } - buildTypes { release { minifyEnabled false diff --git a/mobile/android/gradle/branding/build.gradle b/mobile/android/gradle/branding/build.gradle index dde5bb96030..91aed323f0c 100644 --- a/mobile/android/gradle/branding/build.gradle +++ b/mobile/android/gradle/branding/build.gradle @@ -3,10 +3,6 @@ apply plugin: 'com.android.library' apply from: "${topsrcdir}/mobile/android/gradle/android.gradle" android { - defaultConfig { - applicationId 'org.mozilla.gecko.branding' - } - buildTypes { release { minifyEnabled false diff --git a/mobile/android/gradle/build.gradle b/mobile/android/gradle/build.gradle index 26bc9de8873..8d2257c2b58 100644 --- a/mobile/android/gradle/build.gradle +++ b/mobile/android/gradle/build.gradle @@ -15,7 +15,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.14.4' + // IntelliJ 14.0.2 wants 0.14.4; Android Studio wants 1.0.0. + classpath 'com.android.tools.build:gradle:[0.14.4,1.0.0]' } } diff --git a/mobile/android/gradle/preprocessed_resources/build.gradle b/mobile/android/gradle/preprocessed_resources/build.gradle index 89c470f1a2d..aa0c197c24f 100644 --- a/mobile/android/gradle/preprocessed_resources/build.gradle +++ b/mobile/android/gradle/preprocessed_resources/build.gradle @@ -3,10 +3,6 @@ apply plugin: 'com.android.library' apply from: "${topsrcdir}/mobile/android/gradle/android.gradle" android { - defaultConfig { - applicationId 'org.mozilla.gecko.preprocessed_resources' - } - buildTypes { release { minifyEnabled false diff --git a/mobile/android/gradle/thirdparty/build.gradle b/mobile/android/gradle/thirdparty/build.gradle index a4391d408c1..3786575e32f 100644 --- a/mobile/android/gradle/thirdparty/build.gradle +++ b/mobile/android/gradle/thirdparty/build.gradle @@ -3,10 +3,6 @@ apply plugin: 'com.android.library' apply from: "${topsrcdir}/mobile/android/gradle/android.gradle" android { - defaultConfig { - applicationId 'org.mozilla.gecko.thirdparty' - } - buildTypes { release { minifyEnabled false diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py index 19572c6993f..6eabac19e53 100644 --- a/mobile/android/mach_commands.py +++ b/mobile/android/mach_commands.py @@ -128,7 +128,6 @@ class MachCommands(MachCommandBase): srcdir('base/src/main/java/org/mozilla/mozstumbler', 'mobile/android/stumbler/java/org/mozilla/mozstumbler') srcdir('base/src/main/java/org/mozilla/search', 'mobile/android/search/java/org/mozilla/search') srcdir('base/src/main/res', 'mobile/android/base/resources') - srcdir('base/src/newtablet/res', 'mobile/android/base/newtablet/res') srcdir('base/src/crashreporter/res', 'mobile/android/base/crashreporter/res') manifest_path = os.path.join(self.topobjdir, 'mobile', 'android', 'gradle.manifest')