Bug 1228430 - Move build.gradle out of mobile/android/base. r=me

DONTBUILD NPOTB

--HG--
rename : mobile/android/base/build.gradle => mobile/android/app/base/build.gradle
extra : commitid : EhT7Osnyxex

mobile/android/app/base/build.gradle

@@ -24,10 +24,10 @@ android {
 
     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"
@@ -64,9 +64,9 @@ android {
             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"
                 }
             }
         }

settings.gradle

@@ -46,7 +46,7 @@ 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")