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 647553 d1667f3f465389b4a5c75e5832756238fde49aa3
parent 647451 b9e69115c83246737582ccf0577ba2e20d1a76a9
child 647554 9c679f142f77e40be3ada3f74180f3efe33e6404
child 647965 f65aa8a414aa96d8175556adaf35005b56d18ce5
child 647968 554b4217a5d60e4c2f1d4d8570db68378e99b1f1
child 648002 6192f07cb35cfccbf0a6a751c0c04cc9594787be
child 648034 1144b202c0647ce40d749f7bebce9d2926ee3276
child 648035 da3e8c53e53039e4f1869c042632fc170c19b6b0
child 648077 7845c1f69fc237b2de3e906fc9c4a55ecd67d0fd
child 648110 92badcd6b0d2179090ab22578c6cb959cc51417f
child 648185 8fbefb593c82422fb056b66a38eef633fd8639f8
child 648196 bb512bf5a0669afa0d8158daf906a4223f4ba6ce
child 648287 781c4fdb57cf5f2895a75679b5cf0f8ba0b24899
child 648288 06e97322c49e7211d69f88acfbcb5085c8ae3aed
child 648292 9443fe9ee94637a43047f689c7985aa3225937a5
child 648315 3fb0a43fe5466f1ffa48aa3f310f998625661eaf
child 655289 407bb0380f17bf76621ef20a979d8a4feb3bfe94
child 656611 644ca4da97fa65764c32e2fed40b252cd2afa45e
child 656646 1d8fb66fdbcbbc032224b20cddb1161073693a80
child 657165 c85b5c989371fe4b59d6c6e4ada6a3a00b455052
push id99224
push usermbanner@mozilla.com
push dateThu, 26 Nov 2015 22:11:07 +0000
treeherdertry@2be8d2c8c797 [default view] [failures only]
reviewersme
bugs1228430
milestone45.0a1
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