Bug 1415298 - Pre: Move assets/ into standard Gradle location. r=maliu
☠☠ backed out by a2bf3b8c08ea ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 07 Nov 2017 12:41:21 -0800
changeset 444069 160586d66bcb37a6bd5822b747030ee0a8449248
parent 444068 6e6b4edc850c6e69d800043792f9b0bd23a1ad82
child 444070 e046373e0dca3c6a3834812b2f04b2da35f508cf
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaliu
bugs1415298
milestone58.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 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
mobile/android/app/assets/example_asset.txt
mobile/android/app/assets/parental_controls_theme.png
mobile/android/app/assets/publicsuffixlist
mobile/android/app/build.gradle
mobile/android/app/src/main/assets/example_asset.txt
mobile/android/app/src/main/assets/parental_controls_theme.png
mobile/android/app/src/main/assets/publicsuffixlist
mobile/android/base/moz.build
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -168,17 +168,16 @@ android {
                     srcDir "${topsrcdir}/mobile/android/base/crashreporter/res"
                 }
             }
 
             assets {
                 if (mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY) {
                     srcDir "${mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets"
                 }
-                srcDir "${topsrcdir}/mobile/android/app/assets"
             }
         }
 
         // Every configuration needs the stub manifest at
         // src/main/AndroidManifest.xml and the generated manifest.  We can't
         // use the main sourceSet without losing the stub, so we cover all the
         // configurations by enumerating the buildTypes here.
         debug {
rename from mobile/android/app/assets/example_asset.txt
rename to mobile/android/app/src/main/assets/example_asset.txt
rename from mobile/android/app/assets/parental_controls_theme.png
rename to mobile/android/app/src/main/assets/parental_controls_theme.png
rename from mobile/android/app/assets/publicsuffixlist
rename to mobile/android/app/src/main/assets/publicsuffixlist
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1403,17 +1403,17 @@ ANDROID_RES_DIRS += [
 
 ANDROID_GENERATED_RESFILES += [
     'res/raw/browsersearch.json',
     'res/raw/suggestedsites.json',
     'res/values/strings.xml',
 ]
 
 ANDROID_ASSETS_DIRS += [
-    '/mobile/android/app/assets',
+    '/mobile/android/app/src/main/assets',
 ]
 
 if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']:
     ANDROID_ASSETS_DIRS += [
         '%' + CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY'] + '/assets',
     ]
 
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']