Bug 1366669 - Part 3: Check correct resource folder according to current skin. r=nalexander,walkingice
Check images in photon/res or australis/res based on whether `--enable-photon` is set or not in mozconfig. Thus in build script, suggested sites images can be checked correctly between different skins. MozReview-Commit-ID: 5U13Rp3nOAH --HG-- rename : mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_amazon.png => mobile/android/app/src/australis/res/drawable-hdpi/suggestedsites_amazon.png rename : mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_facebook.png => mobile/android/app/src/australis/res/drawable-hdpi/suggestedsites_facebook.png rename : mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_wikipedia.png => mobile/android/app/src/australis/res/drawable-hdpi/suggestedsites_wikipedia.png rename : mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_youtube.png => mobile/android/app/src/australis/res/drawable-hdpi/suggestedsites_youtube.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_amazon.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_amazon.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_facebook.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_facebook.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_restricted_fxsupport.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_restricted_fxsupport.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_restricted_mozilla.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_restricted_mozilla.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_webmaker.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_webmaker.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_wikipedia.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_wikipedia.png rename : mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_youtube.png => mobile/android/app/src/australis/res/drawable-xhdpi/suggestedsites_youtube.png rename : mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_amazon.png => mobile/android/app/src/australis/res/drawable-xxhdpi/suggestedsites_amazon.png rename : mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_facebook.png => mobile/android/app/src/australis/res/drawable-xxhdpi/suggestedsites_facebook.png rename : mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_wikipedia.png => mobile/android/app/src/australis/res/drawable-xxhdpi/suggestedsites_wikipedia.png rename : mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_youtube.png => mobile/android/app/src/australis/res/drawable-xxhdpi/suggestedsites_youtube.png extra : rebase_source : 76503b57daa52187b9d37dfb98addd64ad5eb3f0
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 775 B After Width: | Height: | Size: 775 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
After Width: | Height: | Size: 4.2 KiB |
After Width: | Height: | Size: 603 B |
After Width: | Height: | Size: 1004 B |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 5.8 KiB |
After Width: | Height: | Size: 775 B |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 9.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 5.4 KiB |
@ -95,11 +95,13 @@ l10n-srcdir := $(if $(filter en-US,$(AB_CD)),,$(or $(realpath $(L10NBASEDIR)),$(
|
||||
|
||||
$(eval $(call generated_file_template,suggestedsites,suggestedsites.json))
|
||||
|
||||
skin := $(if $(MOZ_ANDROID_PHOTON),photon,australis)
|
||||
|
||||
$(suggestedsites-dstdir-raw)/suggestedsites.json: FORCE
|
||||
$(call py_action,generate_suggestedsites, \
|
||||
--verbose \
|
||||
--android-package-name=$(ANDROID_PACKAGE_NAME) \
|
||||
--resources=$(topsrcdir)/mobile/android/app/src/main/res \
|
||||
--resources=$(topsrcdir)/mobile/android/app/src/$(skin)/res \
|
||||
$(if $(filter en-US,$(AB_CD)),,--srcdir=$(l10n-srcdir)) \
|
||||
--srcdir=$(topsrcdir)/mobile/locales/en-US/chrome \
|
||||
$@)
|
||||
|