Bug 1372486 - Part 2: Fix Fennec resource path in build/lint scripts. r=nalexander,nechen,walkingice

MozReview-Commit-ID: LHhAMnC87lK

--HG--
extra : rebase_source : face55bb06e6638ff304c28044fe0e2e8371ea71

mobile/android/app/build.gradle

@@ -183,7 +183,6 @@ android {
             res {
                 srcDir "${topsrcdir}/${mozconfig.substs.MOZ_BRANDING_DIRECTORY}/res"
                 srcDir "${project.buildDir}/generated/source/preprocessed_resources" // See syncPreprocessedResources.
-                srcDir "${topsrcdir}/mobile/android/base/resources"
                 srcDir "${topsrcdir}/mobile/android/services/src/main/res"
                 if (mozconfig.substs.MOZ_CRASHREPORTER) {
                     srcDir "${topsrcdir}/mobile/android/base/crashreporter/res"

mobile/android/app/lint.xml

@@ -61,8 +61,8 @@
         <ignore path="**/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java"/>
         <ignore path="**/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java"/>
         <ignore path="**/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java"/>
-        <ignore path="**/mobile/android/base/resources/values/styles.xml"/>
-        <ignore path="**/mobile/android/base/resources/values/themes.xml"/>
+        <ignore path="src/main/res/values/styles.xml"/>
+        <ignore path="src/main/res/values/themes.xml"/>
     </issue>
 
     <!-- We fixed all "Registered" lint errors. However the current gradle plugin has a bug where

mobile/android/base/locales/Makefile.in

@@ -99,7 +99,7 @@ $(suggestedsites-dstdir-raw)/suggestedsites.json: FORCE
 	$(call py_action,generate_suggestedsites, \
 		--verbose \
 		--android-package-name=$(ANDROID_PACKAGE_NAME) \
-		--resources=$(srcdir)/../resources \
+		--resources=$(topsrcdir)/mobile/android/app/src/main/res \
 		$(if $(filter en-US,$(AB_CD)),,--srcdir=$(l10n-srcdir)) \
 		--srcdir=$(topsrcdir)/mobile/locales/en-US/chrome \
 		$@)

mobile/android/base/moz.build

@@ -1370,7 +1370,7 @@ if CONFIG['MOZ_ANDROID_MMA']:
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
     '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
-    'resources',
+    '/mobile/android/app/src/main/res',
     '/mobile/android/services/src/main/res',
     '!res',
 ]