Bug 1228430 - Move build.gradle out of mobile/android/base. r=me
authorNick Alexander <nalexander@mozilla.com>
Thu, 26 Nov 2015 13:02:00 -0800
changeset 274478 d1667f3f465389b4a5c75e5832756238fde49aa3
parent 274379 b9e69115c83246737582ccf0577ba2e20d1a76a9
child 274479 bb512bf5a0669afa0d8158daf906a4223f4ba6ce
push id29733
push usercbook@mozilla.com
push dateMon, 30 Nov 2015 12:16:19 +0000
treeherdermozilla-central@2d385f1302a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1228430
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1228430 - Move build.gradle out of mobile/android/base. r=me DONTBUILD NPOTB
mobile/android/app/base/build.gradle
mobile/android/base/build.gradle
settings.gradle
rename from mobile/android/base/build.gradle
rename to mobile/android/app/base/build.gradle
--- a/mobile/android/base/build.gradle
+++ b/mobile/android/app/base/build.gradle
@@ -19,20 +19,20 @@ android {
     }
 
     lintOptions {
         abortOnError false
     }
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
+            manifest.srcFile "${topsrcdir}/mobile/android/base/AndroidManifest.xml"
+
             java {
                 srcDir "${topobjdir}/gradle/base/src"
-                exclude 'org/mozilla/gecko/resources/**'
 
                 srcDir "${topsrcdir}/mobile/android/search/java"
                 srcDir "${topsrcdir}/mobile/android/javaaddons/java"
 
                 if (mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
                     srcDir "${topsrcdir}/mobile/android/stumbler/java"
                 }
 
@@ -59,19 +59,19 @@ android {
                 }
 
                 srcDir "${project.buildDir}/generated/source/preprocessed_code" // See syncPreprocessedCode.
             }
 
             res {
                 srcDir "${topsrcdir}/${mozconfig.substs.MOZ_BRANDING_DIRECTORY}/res"
                 srcDir "${project.buildDir}/generated/source/preprocessed_resources" // See syncPreprocessedResources.
-                srcDir 'resources'
+                srcDir "${topsrcdir}/mobile/android/base/resources"
                 if (mozconfig.substs.MOZ_CRASHREPORTER) {
-                    srcDir 'crashreporter/res'
+                    srcDir "${topsrcdir}/mobile/android/base/crashreporter/res"
                 }
             }
         }
 
         test {
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/background/junit4/src"
             }
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,17 +41,17 @@ def srcdir = { dst, src ->
 srcdir('base/src/org/mozilla/gecko', 'mobile/android/base')
 
 include ':app'
 include ':base'
 include ':omnijar'
 include ':thirdparty'
 
 project(':app').projectDir = new File("${json.topsrcdir}/mobile/android/app")
-project(':base').projectDir = new File("${json.topsrcdir}/mobile/android/base")
+project(':base').projectDir = new File("${json.topsrcdir}/mobile/android/app/base")
 project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")
 project(':thirdparty').projectDir = new File("${json.topsrcdir}/mobile/android/thirdparty")
 
 // The Gradle instance is shared between settings.gradle and all the
 // other build.gradle files (see
 // http://forums.gradle.org/gradle/topics/define_extension_properties_from_settings_xml).
 // We use this ext property to pass the per-object-directory mozconfig
 // between scripts.  This lets us execute set-up code before we gradle