Bug 1415298 - Pre: Move assets/ into standard Gradle location. r=maliu

This is part of a larger project to standardize our source locations.

MozReview-Commit-ID: Gbh9qSW7RJY

--HG--
rename : mobile/android/app/assets/example_asset.txt => mobile/android/app/src/main/assets/example_asset.txt
rename : mobile/android/app/assets/parental_controls_theme.png => mobile/android/app/src/main/assets/parental_controls_theme.png
rename : mobile/android/app/assets/publicsuffixlist => mobile/android/app/src/main/assets/publicsuffixlist
extra : rebase_source : dad3ded6a41d60989921b437dcf91181854c7b5a

mobile/android/app/build.gradle

@@ -173,7 +173,6 @@ android {
                 if (mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY) {
                     srcDir "${mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets"
                 }
-                srcDir "${topsrcdir}/mobile/android/app/assets"
             }
         }
 

mobile/android/app/moz.build

@@ -19,12 +19,12 @@ with Files('mobile*'):
 with Files('ua-update.json.in'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
-with Files('assets/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'General')
-
 with Files('omnijar/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
 
+with Files('src/main/**'):
+    BUG_COMPONENT = ('Firefox for Android', 'General')
+
 with Files('src/androidTest/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Testing')
 

mobile/android/base/moz.build

@@ -1408,7 +1408,7 @@ ANDROID_GENERATED_RESFILES += [
 ]
 
 ANDROID_ASSETS_DIRS += [
-    '/mobile/android/app/assets',
+    '/mobile/android/app/src/main/assets',
 ]
 
 if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']: