Merge m-c to mozilla-inbound

build/mobile/robocop/moz.build

@@ -3,3 +3,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_RESFILES = [
+    'res/values/strings.xml',
+]

build/mobile/sutagent/android/fencp/moz.build

@@ -3,3 +3,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_RESFILES = [
+    'res/drawable-hdpi/icon.png',
+    'res/drawable-ldpi/icon.png',
+    'res/drawable-mdpi/icon.png',
+    'res/layout/main.xml',
+    'res/values/strings.xml',
+]

build/mobile/sutagent/android/ffxcp/moz.build

@@ -3,3 +3,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_RESFILES = [
+    'res/drawable-hdpi/icon.png',
+    'res/drawable-ldpi/icon.png',
+    'res/drawable-mdpi/icon.png',
+    'res/layout/main.xml',
+    'res/values/strings.xml',
+]

build/mobile/sutagent/android/moz.build

@@ -3,3 +3,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_RESFILES = [
+    'res/drawable/ateamlogo.png',
+    'res/drawable/ic_stat_first.png',
+    'res/drawable/ic_stat_neterror.png',
+    'res/drawable/ic_stat_warning.png',
+    'res/drawable/icon.png',
+    'res/layout/main.xml',
+    'res/values/strings.xml',
+]

build/mobile/sutagent/android/watcher/moz.build

@@ -3,3 +3,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_RESFILES = [
+    'res/drawable-hdpi/ateamlogo.png',
+    'res/drawable-hdpi/icon.png',
+    'res/drawable-ldpi/ateamlogo.png',
+    'res/drawable-ldpi/icon.png',
+    'res/drawable-mdpi/ateamlogo.png',
+    'res/drawable-mdpi/icon.png',
+    'res/layout/main.xml',
+    'res/values/strings.xml',
+]

config/config.mk

@@ -35,7 +35,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
-  ANDROID_RES_DIRS \
+  ANDROID_RESFILES \
   CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
@@ -73,7 +73,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
-  ANDROID_RESFILES \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
   SHORT_LIBNAME \

config/makefiles/java-build.mk

@@ -7,6 +7,29 @@
 
 ifndef INCLUDED_JAVA_BUILD_MK #{
 
+ifdef ANDROID_RESFILES #{
+ifndef IGNORE_ANDROID_RESFILES #{
+res-dep := .deps-copy-java-res
+
+GENERATED_DIRS += res
+GARBAGE        += $(res-dep)
+
+export:: $(res-dep)
+
+res-dep-preqs := \
+  $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
+  $(call mkdir_deps,res) \
+  $(if $(IS_LANGUAGE_REPACK),FORCE) \
+  $(NULL)
+
+# nop-build: only copy res/ files when needed
+$(res-dep): $(res-dep-preqs)
+	$(call copy_dir,$(srcdir)/res,$(CURDIR)/res)
+	@$(TOUCH) $@
+endif #} IGNORE_ANDROID_RESFILES
+endif #} ANDROID_RESFILES
+
+
 ifdef JAVAFILES #{
 GENERATED_DIRS += classes
 
@@ -16,8 +39,7 @@ endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
-_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
+_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res)
 _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
 
 GENERATED_DIRS += classes
@@ -35,11 +57,7 @@ classes.dex: $(JAVAFILES)
 R.java: .aapt.deps
 $(ANDROID_APK_NAME).ap_: .aapt.deps
 
-# This uses the fact that Android resource directories list all
-# resource files one subdirectory below the parent resource directory.
-android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs)))))
-
-.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR))
+.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR))
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		-J ${@D} \
 		-F $(ANDROID_APK_NAME).ap_

js/src/config/config.mk

@@ -35,7 +35,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
-  ANDROID_RES_DIRS \
+  ANDROID_RESFILES \
   CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
@@ -73,7 +73,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
-  ANDROID_RESFILES \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
   SHORT_LIBNAME \

js/src/config/makefiles/java-build.mk

@@ -7,6 +7,29 @@
 
 ifndef INCLUDED_JAVA_BUILD_MK #{
 
+ifdef ANDROID_RESFILES #{
+ifndef IGNORE_ANDROID_RESFILES #{
+res-dep := .deps-copy-java-res
+
+GENERATED_DIRS += res
+GARBAGE        += $(res-dep)
+
+export:: $(res-dep)
+
+res-dep-preqs := \
+  $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
+  $(call mkdir_deps,res) \
+  $(if $(IS_LANGUAGE_REPACK),FORCE) \
+  $(NULL)
+
+# nop-build: only copy res/ files when needed
+$(res-dep): $(res-dep-preqs)
+	$(call copy_dir,$(srcdir)/res,$(CURDIR)/res)
+	@$(TOUCH) $@
+endif #} IGNORE_ANDROID_RESFILES
+endif #} ANDROID_RESFILES
+
+
 ifdef JAVAFILES #{
 GENERATED_DIRS += classes
 
@@ -16,8 +39,7 @@ endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
-_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
+_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res)
 _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
 
 GENERATED_DIRS += classes
@@ -35,11 +57,7 @@ classes.dex: $(JAVAFILES)
 R.java: .aapt.deps
 $(ANDROID_APK_NAME).ap_: .aapt.deps
 
-# This uses the fact that Android resource directories list all
-# resource files one subdirectory below the parent resource directory.
-android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs)))))
-
-.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR))
+.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR))
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		-J ${@D} \
 		-F $(ANDROID_APK_NAME).ap_

mobile/android/base/Makefile.in

@@ -91,6 +91,17 @@ GARBAGE += \
 
 GARBAGE_DIRS += classes db jars res sync services generated
 
+# Bug 567884 - Need a way to find appropriate icons during packaging
+ifeq ($(MOZ_APP_NAME),fennec)
+ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png
+ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png
+ICON_PATH_XHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_96x96.png
+ICON_PATH_XXHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_144x144.png
+else
+ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png
+ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png
+endif
+
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
 ALL_JARS = \
@@ -181,16 +192,34 @@ preprocessed_package_KEEP_PATH := 1
 
 PP_TARGETS += preprocessed_package
 
-# This uses the fact that Android resource directories list all
-# resource files one subdirectory below the parent resource directory.
-android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(ANDROID_RES_DIRS)))))
+res/drawable-mdpi/icon.png: $(ICON_PATH)
+	$(NSINSTALL) -D res/drawable-mdpi
+	cp $(ICON_PATH) $@
 
-$(ANDROID_GENERATED_RESFILES): $(call mkdir_deps,$(sort $(dir $(ANDROID_GENERATED_RESFILES))))
+res/drawable-hdpi/icon.png: $(ICON_PATH_HDPI)
+	$(NSINSTALL) -D res/drawable-hdpi
+	cp $(ICON_PATH_HDPI) $@
 
-# We don't have correct dependencies for strings.xml at this point, so
-# we always recursively invoke the submake to check the dependencies.
-# Sigh.
-res/values/strings.xml: FORCE
+res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI)
+	$(NSINSTALL) -D res/drawable-xhdpi
+	cp $(ICON_PATH_XHDPI) $@
+
+res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI)
+	$(NSINSTALL) -D res/drawable-xxhdpi
+	cp $(ICON_PATH_XXHDPI) $@
+
+ANDROID_RESDIRS := $(subst resources/,res/,$(sort $(dir $(ANDROID_RESFILES))))
+
+$(call mkdir_deps,$(ANDROID_RESDIRS)): $(ANDROID_RESFILES) Makefile
+	$(RM) -r $(@D)
+	$(NSINSTALL) -D $(@D)
+	$(TOUCH) $@
+
+$(subst resources/,res/,$(ANDROID_RESFILES)): $(call mkdir_deps,$(ANDROID_RESDIRS)) $(ANDROID_RESFILES)
+	@echo "creating $@"
+	$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
+
+res/values/strings.xml: $(call mkdir_deps,res/values)
 	$(MAKE) -C locales
 
 # With multilocale builds, there will be multiple strings.xml files. We need to
@@ -199,22 +228,18 @@ MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml)
 all_resources = \
   $(MULTILOCALE_STRINGS_XML_FILES) \
   AndroidManifest.xml \
-  $(android_res_files) \
+  $(subst resources/,res/,$(ANDROID_RESFILES)) \
   $(ANDROID_GENERATED_RESFILES) \
   $(NULL)
 
-$(gecko_package_dir)/R.txt: .aapt.deps
+# generated/org/mozilla/gecko/R.java and gecko.ap_ are both produced
+# by aapt; this saves an aapt invocation.
+
 $(gecko_package_dir)/R.java: .aapt.deps
 gecko.ap_: .aapt.deps
 
-# All of generated/org/mozilla/gecko/R.java, R.txt, and gecko.ap_ are
-# produced by aapt; this saves aapt invocations.
 .aapt.deps: $(all_resources)
-	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar \
-		--auto-add-overlay \
-		$(addprefix -S ,$(ANDROID_RES_DIRS)) \
-		--custom-package org.mozilla.gecko --non-constant-id \
-		--output-text-symbols $(gecko_package_dir) \
+	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res --custom-package org.mozilla.gecko --non-constant-id \
 		-J $(gecko_package_dir)/ \
 		-F gecko.ap_
 	@$(TOUCH) $@
@@ -222,6 +247,10 @@ gecko.ap_: .aapt.deps
 fennec_ids.txt: $(gecko_package_dir)/R.java fennec-ids-generator.py
 	$(PYTHON) $(topsrcdir)/mobile/android/base/fennec-ids-generator.py -i $< -o $@
 
+# We process ANDROID_RESFILES specially for now; the following flag
+# disables the default processing.
+IGNORE_ANDROID_RESFILES=1
+
 include $(topsrcdir)/config/rules.mk
 
 # Override the Java settings with some specific android settings

mobile/android/base/android-services.mozbuild

@@ -4,6 +4,29 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+ANDROID_RESFILES += [
+    'resources/drawable-mdpi/sync_desktop.png',
+    'resources/drawable-mdpi/sync_mobile.png',
+    'resources/drawable/sync_pin_background.xml',
+    'resources/layout/sync_account.xml',
+    'resources/layout/sync_list_item.xml',
+    'resources/layout/sync_redirect_to_setup.xml',
+    'resources/layout/sync_send_tab.xml',
+    'resources/layout/sync_setup.xml',
+    'resources/layout/sync_setup_failure.xml',
+    'resources/layout/sync_setup_jpake_waiting.xml',
+    'resources/layout/sync_setup_nointernet.xml',
+    'resources/layout/sync_setup_pair.xml',
+    'resources/layout/sync_setup_success.xml',
+    'resources/layout/sync_setup_webview.xml',
+    'resources/values-large-v11/sync_styles.xml',
+    'resources/values-v11/sync_styles.xml',
+    'resources/values/sync_styles.xml',
+    'resources/xml/sync_authenticator.xml',
+    'resources/xml/sync_options.xml',
+    'resources/xml/sync_syncadapter.xml',
+]
+
 sync_thirdparty_java_files = [
     'ch/boye/httpclientandroidlib/androidextra/HttpClientAndroidLog.java',
     'ch/boye/httpclientandroidlib/annotation/GuardedBy.java',

mobile/android/base/moz.build

@@ -343,8 +343,6 @@ gbjar.generated_sources += [
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
     gbjar.sources += [ 'CrashReporter.java ']
-    ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]
-
 gbjar.sources += sync_java_files
 gbjar.generated_sources += sync_generated_java_files
 gbjar.extra_jars = [
@@ -355,12 +353,605 @@ gbjar.extra_jars = [
 ]
 gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough']
 
-ANDROID_RES_DIRS += [
-    SRCDIR + '/resources',
-    TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
-    OBJDIR + '/res',
-]
-
 ANDROID_GENERATED_RESFILES += [
+    'res/drawable-hdpi/icon.png',
+    'res/drawable-mdpi/icon.png',
+    'res/drawable-xhdpi/icon.png',
+    'res/drawable-xxhdpi/icon.png',
     'res/values/strings.xml',
 ]
+
+ANDROID_RESFILES += [
+    'resources/anim/grow_fade_in.xml',
+    'resources/anim/grow_fade_in_center.xml',
+    'resources/anim/popup_hide.xml',
+    'resources/anim/popup_show.xml',
+    'resources/anim/progress_spinner.xml',
+    'resources/anim/shrink_fade_out.xml',
+    'resources/color/primary_text.xml',
+    'resources/color/primary_text_inverse.xml',
+    'resources/color/secondary_text.xml',
+    'resources/color/secondary_text_inverse.xml',
+    'resources/color/select_item_multichoice.xml',
+    'resources/color/tertiary_text.xml',
+    'resources/color/tertiary_text_inverse.xml',
+    'resources/color/top_sites_grid_item_title.xml',
+    'resources/color/url_bar_title.xml',
+    'resources/color/url_bar_title_hint.xml',
+    'resources/drawable-hdpi-v11/alert_addon.png',
+    'resources/drawable-hdpi-v11/alert_app.png',
+    'resources/drawable-hdpi-v11/alert_camera.png',
+    'resources/drawable-hdpi-v11/alert_download.png',
+    'resources/drawable-hdpi-v11/alert_mic.png',
+    'resources/drawable-hdpi-v11/alert_mic_camera.png',
+    'resources/drawable-hdpi-v11/firefox_settings_alert.png',
+    'resources/drawable-hdpi-v11/ic_menu_addons.png',
+    'resources/drawable-hdpi-v11/ic_menu_apps.png',
+    'resources/drawable-hdpi-v11/ic_menu_back.png',
+    'resources/drawable-hdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable-hdpi-v11/ic_menu_desktop_mode_off.png',
+    'resources/drawable-hdpi-v11/ic_menu_desktop_mode_on.png',
+    'resources/drawable-hdpi-v11/ic_menu_downloads.png',
+    'resources/drawable-hdpi-v11/ic_menu_find_in_page.png',
+    'resources/drawable-hdpi-v11/ic_menu_forward.png',
+    'resources/drawable-hdpi-v11/ic_menu_new_private_tab.png',
+    'resources/drawable-hdpi-v11/ic_menu_new_tab.png',
+    'resources/drawable-hdpi-v11/ic_menu_quit.png',
+    'resources/drawable-hdpi-v11/ic_menu_reload.png',
+    'resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png',
+    'resources/drawable-hdpi-v11/ic_menu_settings.png',
+    'resources/drawable-hdpi-v11/ic_menu_share.png',
+    'resources/drawable-hdpi-v11/ic_menu_tools.png',
+    'resources/drawable-hdpi-v11/ic_status_logo.png',
+    'resources/drawable-hdpi/abouthome_thumbnail.png',
+    'resources/drawable-hdpi/alert_addon.png',
+    'resources/drawable-hdpi/alert_app.png',
+    'resources/drawable-hdpi/alert_camera.png',
+    'resources/drawable-hdpi/alert_download.png',
+    'resources/drawable-hdpi/alert_mic.png',
+    'resources/drawable-hdpi/alert_mic_camera.png',
+    'resources/drawable-hdpi/arrow_popup_bg.9.png',
+    'resources/drawable-hdpi/blank.png',
+    'resources/drawable-hdpi/bookmark_folder_closed.png',
+    'resources/drawable-hdpi/bookmark_folder_opened.png',
+    'resources/drawable-hdpi/close.png',
+    'resources/drawable-hdpi/favicon.png',
+    'resources/drawable-hdpi/find_close.png',
+    'resources/drawable-hdpi/find_next.png',
+    'resources/drawable-hdpi/find_prev.png',
+    'resources/drawable-hdpi/folder.png',
+    'resources/drawable-hdpi/grid_icon_bg_activated.9.png',
+    'resources/drawable-hdpi/grid_icon_bg_focused.9.png',
+    'resources/drawable-hdpi/handle_end.png',
+    'resources/drawable-hdpi/handle_middle.png',
+    'resources/drawable-hdpi/handle_start.png',
+    'resources/drawable-hdpi/history_tabs_indicator_selected.9.png',
+    'resources/drawable-hdpi/home_bg.png',
+    'resources/drawable-hdpi/home_star.png',
+    'resources/drawable-hdpi/home_tab_menu_strip.9.png',
+    'resources/drawable-hdpi/ic_menu_addons_filler.png',
+    'resources/drawable-hdpi/ic_menu_bookmark_add.png',
+    'resources/drawable-hdpi/ic_menu_bookmark_remove.png',
+    'resources/drawable-hdpi/ic_menu_character_encoding.png',
+    'resources/drawable-hdpi/ic_menu_forward.png',
+    'resources/drawable-hdpi/ic_menu_guest.png',
+    'resources/drawable-hdpi/ic_menu_new_private_tab.png',
+    'resources/drawable-hdpi/ic_menu_new_tab.png',
+    'resources/drawable-hdpi/ic_menu_reload.png',
+    'resources/drawable-hdpi/ic_status_logo.png',
+    'resources/drawable-hdpi/ic_url_bar_go.png',
+    'resources/drawable-hdpi/ic_url_bar_reader.png',
+    'resources/drawable-hdpi/ic_url_bar_search.png',
+    'resources/drawable-hdpi/ic_url_bar_star.png',
+    'resources/drawable-hdpi/ic_url_bar_tab.png',
+    'resources/drawable-hdpi/icon_bookmarks_empty.png',
+    'resources/drawable-hdpi/icon_last_tabs.png',
+    'resources/drawable-hdpi/icon_last_tabs_empty.png',
+    'resources/drawable-hdpi/icon_most_recent.png',
+    'resources/drawable-hdpi/icon_most_recent_empty.png',
+    'resources/drawable-hdpi/icon_most_visited.png',
+    'resources/drawable-hdpi/icon_openinapp.png',
+    'resources/drawable-hdpi/icon_pageaction.png',
+    'resources/drawable-hdpi/icon_reading_list_empty.png',
+    'resources/drawable-hdpi/larry.png',
+    'resources/drawable-hdpi/lock_identified.png',
+    'resources/drawable-hdpi/lock_verified.png',
+    'resources/drawable-hdpi/menu.png',
+    'resources/drawable-hdpi/menu_item_check.png',
+    'resources/drawable-hdpi/menu_item_more.png',
+    'resources/drawable-hdpi/menu_item_uncheck.png',
+    'resources/drawable-hdpi/menu_panel_bg.9.png',
+    'resources/drawable-hdpi/menu_pb.png',
+    'resources/drawable-hdpi/menu_popup_arrow_bottom.png',
+    'resources/drawable-hdpi/menu_popup_arrow_top.png',
+    'resources/drawable-hdpi/menu_popup_bg.9.png',
+    'resources/drawable-hdpi/pause.png',
+    'resources/drawable-hdpi/pin.png',
+    'resources/drawable-hdpi/play.png',
+    'resources/drawable-hdpi/reader.png',
+    'resources/drawable-hdpi/reader_active.png',
+    'resources/drawable-hdpi/reader_cropped.png',
+    'resources/drawable-hdpi/reading_list.png',
+    'resources/drawable-hdpi/shield.png',
+    'resources/drawable-hdpi/shield_doorhanger.png',
+    'resources/drawable-hdpi/spinner_default.9.png',
+    'resources/drawable-hdpi/spinner_focused.9.png',
+    'resources/drawable-hdpi/spinner_pressed.9.png',
+    'resources/drawable-hdpi/tab_close.png',
+    'resources/drawable-hdpi/tab_indicator_divider.9.png',
+    'resources/drawable-hdpi/tab_indicator_selected.9.png',
+    'resources/drawable-hdpi/tab_indicator_selected_focused.9.png',
+    'resources/drawable-hdpi/tab_new.png',
+    'resources/drawable-hdpi/tab_new_pb.png',
+    'resources/drawable-hdpi/tab_thumbnail_default.png',
+    'resources/drawable-hdpi/tab_thumbnail_shadow.png',
+    'resources/drawable-hdpi/tabs_count.png',
+    'resources/drawable-hdpi/tabs_count_foreground.png',
+    'resources/drawable-hdpi/tabs_normal.png',
+    'resources/drawable-hdpi/tabs_private.png',
+    'resources/drawable-hdpi/tabs_synced.png',
+    'resources/drawable-hdpi/tip_addsearch.png',
+    'resources/drawable-hdpi/top_site_add.png',
+    'resources/drawable-hdpi/url_bar_entry_default.9.png',
+    'resources/drawable-hdpi/url_bar_entry_default_pb.9.png',
+    'resources/drawable-hdpi/url_bar_entry_pressed.9.png',
+    'resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png',
+    'resources/drawable-hdpi/urlbar_stop.png',
+    'resources/drawable-hdpi/validation_arrow.png',
+    'resources/drawable-hdpi/validation_arrow_inverted.png',
+    'resources/drawable-hdpi/validation_bg.9.png',
+    'resources/drawable-hdpi/warning.png',
+    'resources/drawable-hdpi/warning_doorhanger.png',
+    'resources/drawable-large-hdpi-v11/arrow_popup_bg.9.png',
+    'resources/drawable-large-hdpi-v11/ic_menu_forward.png',
+    'resources/drawable-large-hdpi-v11/ic_menu_reload.png',
+    'resources/drawable-large-hdpi-v11/menu.png',
+    'resources/drawable-large-land-v11/home_history_tabs_indicator.xml',
+    'resources/drawable-large-mdpi-v11/arrow_popup_bg.9.png',
+    'resources/drawable-large-mdpi-v11/ic_menu_forward.png',
+    'resources/drawable-large-mdpi-v11/ic_menu_reload.png',
+    'resources/drawable-large-mdpi-v11/menu.png',
+    'resources/drawable-large-xhdpi-v11/arrow_popup_bg.9.png',
+    'resources/drawable-large-xhdpi-v11/ic_menu_forward.png',
+    'resources/drawable-large-xhdpi-v11/ic_menu_reload.png',
+    'resources/drawable-large-xhdpi-v11/menu.png',
+    'resources/drawable-mdpi-v11/alert_addon.png',
+    'resources/drawable-mdpi-v11/alert_app.png',
+    'resources/drawable-mdpi-v11/alert_camera.png',
+    'resources/drawable-mdpi-v11/alert_download.png',
+    'resources/drawable-mdpi-v11/alert_mic.png',
+    'resources/drawable-mdpi-v11/alert_mic_camera.png',
+    'resources/drawable-mdpi-v11/firefox_settings_alert.png',
+    'resources/drawable-mdpi-v11/ic_menu_addons.png',
+    'resources/drawable-mdpi-v11/ic_menu_apps.png',
+    'resources/drawable-mdpi-v11/ic_menu_back.png',
+    'resources/drawable-mdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable-mdpi-v11/ic_menu_desktop_mode_off.png',
+    'resources/drawable-mdpi-v11/ic_menu_desktop_mode_on.png',
+    'resources/drawable-mdpi-v11/ic_menu_downloads.png',
+    'resources/drawable-mdpi-v11/ic_menu_find_in_page.png',
+    'resources/drawable-mdpi-v11/ic_menu_forward.png',
+    'resources/drawable-mdpi-v11/ic_menu_new_private_tab.png',
+    'resources/drawable-mdpi-v11/ic_menu_new_tab.png',
+    'resources/drawable-mdpi-v11/ic_menu_quit.png',
+    'resources/drawable-mdpi-v11/ic_menu_reload.png',
+    'resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png',
+    'resources/drawable-mdpi-v11/ic_menu_settings.png',
+    'resources/drawable-mdpi-v11/ic_menu_share.png',
+    'resources/drawable-mdpi-v11/ic_menu_tools.png',
+    'resources/drawable-mdpi-v11/ic_status_logo.png',
+    'resources/drawable-mdpi/abouthome_thumbnail.png',
+    'resources/drawable-mdpi/alert_addon.png',
+    'resources/drawable-mdpi/alert_app.png',
+    'resources/drawable-mdpi/alert_camera.png',
+    'resources/drawable-mdpi/alert_download.png',
+    'resources/drawable-mdpi/alert_mic.png',
+    'resources/drawable-mdpi/alert_mic_camera.png',
+    'resources/drawable-mdpi/arrow_popup_bg.9.png',
+    'resources/drawable-mdpi/autocomplete_list_bg.9.png',
+    'resources/drawable-mdpi/blank.png',
+    'resources/drawable-mdpi/bookmark_folder_closed.png',
+    'resources/drawable-mdpi/bookmark_folder_opened.png',
+    'resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png',
+    'resources/drawable-mdpi/bookmarkdefaults_favicon_support.png',
+    'resources/drawable-mdpi/close.png',
+    'resources/drawable-mdpi/desktop_notification.png',
+    'resources/drawable-mdpi/favicon.png',
+    'resources/drawable-mdpi/find_close.png',
+    'resources/drawable-mdpi/find_next.png',
+    'resources/drawable-mdpi/find_prev.png',
+    'resources/drawable-mdpi/folder.png',
+    'resources/drawable-mdpi/grid_icon_bg_activated.9.png',
+    'resources/drawable-mdpi/grid_icon_bg_focused.9.png',
+    'resources/drawable-mdpi/handle_end.png',
+    'resources/drawable-mdpi/handle_middle.png',
+    'resources/drawable-mdpi/handle_start.png',
+    'resources/drawable-mdpi/history_tabs_indicator_selected.9.png',
+    'resources/drawable-mdpi/home_tab_menu_strip.9.png',
+    'resources/drawable-mdpi/ic_menu_addons_filler.png',
+    'resources/drawable-mdpi/ic_menu_bookmark_add.png',
+    'resources/drawable-mdpi/ic_menu_bookmark_remove.png',
+    'resources/drawable-mdpi/ic_menu_character_encoding.png',
+    'resources/drawable-mdpi/ic_menu_forward.png',
+    'resources/drawable-mdpi/ic_menu_guest.png',
+    'resources/drawable-mdpi/ic_menu_new_private_tab.png',
+    'resources/drawable-mdpi/ic_menu_new_tab.png',
+    'resources/drawable-mdpi/ic_menu_reload.png',
+    'resources/drawable-mdpi/ic_status_logo.png',
+    'resources/drawable-mdpi/ic_url_bar_go.png',
+    'resources/drawable-mdpi/ic_url_bar_reader.png',
+    'resources/drawable-mdpi/ic_url_bar_search.png',
+    'resources/drawable-mdpi/ic_url_bar_star.png',
+    'resources/drawable-mdpi/ic_url_bar_tab.png',
+    'resources/drawable-mdpi/icon_bookmarks_empty.png',
+    'resources/drawable-mdpi/icon_last_tabs.png',
+    'resources/drawable-mdpi/icon_last_tabs_empty.png',
+    'resources/drawable-mdpi/icon_most_recent.png',
+    'resources/drawable-mdpi/icon_most_recent_empty.png',
+    'resources/drawable-mdpi/icon_most_visited.png',
+    'resources/drawable-mdpi/icon_openinapp.png',
+    'resources/drawable-mdpi/icon_pageaction.png',
+    'resources/drawable-mdpi/icon_reading_list_empty.png',
+    'resources/drawable-mdpi/larry.png',
+    'resources/drawable-mdpi/lock_identified.png',
+    'resources/drawable-mdpi/lock_verified.png',
+    'resources/drawable-mdpi/marketplace.png',
+    'resources/drawable-mdpi/menu.png',
+    'resources/drawable-mdpi/menu_item_check.png',
+    'resources/drawable-mdpi/menu_item_more.png',
+    'resources/drawable-mdpi/menu_item_uncheck.png',
+    'resources/drawable-mdpi/menu_panel_bg.9.png',
+    'resources/drawable-mdpi/menu_pb.png',
+    'resources/drawable-mdpi/menu_popup_arrow_bottom.png',
+    'resources/drawable-mdpi/menu_popup_arrow_top.png',
+    'resources/drawable-mdpi/menu_popup_bg.9.png',
+    'resources/drawable-mdpi/pause.png',
+    'resources/drawable-mdpi/pin.png',
+    'resources/drawable-mdpi/play.png',
+    'resources/drawable-mdpi/progress_spinner.png',
+    'resources/drawable-mdpi/reader.png',
+    'resources/drawable-mdpi/reader_active.png',
+    'resources/drawable-mdpi/reader_cropped.png',
+    'resources/drawable-mdpi/reading_list.png',
+    'resources/drawable-mdpi/scrollbar.png',
+    'resources/drawable-mdpi/shadow.png',
+    'resources/drawable-mdpi/shield.png',
+    'resources/drawable-mdpi/shield_doorhanger.png',
+    'resources/drawable-mdpi/spinner_default.9.png',
+    'resources/drawable-mdpi/spinner_focused.9.png',
+    'resources/drawable-mdpi/spinner_pressed.9.png',
+    'resources/drawable-mdpi/start.png',
+    'resources/drawable-mdpi/tab_close.png',
+    'resources/drawable-mdpi/tab_indicator_divider.9.png',
+    'resources/drawable-mdpi/tab_indicator_selected.9.png',
+    'resources/drawable-mdpi/tab_indicator_selected_focused.9.png',
+    'resources/drawable-mdpi/tab_new.png',
+    'resources/drawable-mdpi/tab_new_pb.png',
+    'resources/drawable-mdpi/tab_thumbnail_default.png',
+    'resources/drawable-mdpi/tab_thumbnail_shadow.png',
+    'resources/drawable-mdpi/tabs_count.png',
+    'resources/drawable-mdpi/tabs_count_foreground.png',
+    'resources/drawable-mdpi/tabs_normal.png',
+    'resources/drawable-mdpi/tabs_private.png',
+    'resources/drawable-mdpi/tabs_synced.png',
+    'resources/drawable-mdpi/tip_addsearch.png',
+    'resources/drawable-mdpi/toast.9.png',
+    'resources/drawable-mdpi/toast_button_focused.9.png',
+    'resources/drawable-mdpi/toast_button_pressed.9.png',
+    'resources/drawable-mdpi/toast_divider.9.png',
+    'resources/drawable-mdpi/top_site_add.png',
+    'resources/drawable-mdpi/url_bar_entry_default.9.png',
+    'resources/drawable-mdpi/url_bar_entry_default_pb.9.png',
+    'resources/drawable-mdpi/url_bar_entry_pressed.9.png',
+    'resources/drawable-mdpi/url_bar_entry_pressed_pb.9.png',
+    'resources/drawable-mdpi/urlbar_stop.png',
+    'resources/drawable-mdpi/validation_arrow.png',
+    'resources/drawable-mdpi/validation_arrow_inverted.png',
+    'resources/drawable-mdpi/validation_bg.9.png',
+    'resources/drawable-mdpi/warning.png',
+    'resources/drawable-mdpi/warning_doorhanger.png',
+    'resources/drawable-xhdpi-v11/alert_addon.png',
+    'resources/drawable-xhdpi-v11/alert_app.png',
+    'resources/drawable-xhdpi-v11/alert_camera.png',
+    'resources/drawable-xhdpi-v11/alert_download.png',
+    'resources/drawable-xhdpi-v11/alert_mic.png',
+    'resources/drawable-xhdpi-v11/alert_mic_camera.png',
+    'resources/drawable-xhdpi-v11/firefox_settings_alert.png',
+    'resources/drawable-xhdpi-v11/ic_menu_addons.png',
+    'resources/drawable-xhdpi-v11/ic_menu_apps.png',
+    'resources/drawable-xhdpi-v11/ic_menu_back.png',
+    'resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_off.png',
+    'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_on.png',
+    'resources/drawable-xhdpi-v11/ic_menu_downloads.png',
+    'resources/drawable-xhdpi-v11/ic_menu_find_in_page.png',
+    'resources/drawable-xhdpi-v11/ic_menu_forward.png',
+    'resources/drawable-xhdpi-v11/ic_menu_new_private_tab.png',
+    'resources/drawable-xhdpi-v11/ic_menu_new_tab.png',
+    'resources/drawable-xhdpi-v11/ic_menu_quit.png',
+    'resources/drawable-xhdpi-v11/ic_menu_reload.png',
+    'resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png',
+    'resources/drawable-xhdpi-v11/ic_menu_settings.png',
+    'resources/drawable-xhdpi-v11/ic_menu_share.png',
+    'resources/drawable-xhdpi-v11/ic_menu_tools.png',
+    'resources/drawable-xhdpi-v11/ic_status_logo.png',
+    'resources/drawable-xhdpi/abouthome_thumbnail.png',
+    'resources/drawable-xhdpi/alert_addon.png',
+    'resources/drawable-xhdpi/alert_app.png',
+    'resources/drawable-xhdpi/alert_camera.png',
+    'resources/drawable-xhdpi/alert_download.png',
+    'resources/drawable-xhdpi/alert_mic.png',
+    'resources/drawable-xhdpi/alert_mic_camera.png',
+    'resources/drawable-xhdpi/arrow_popup_bg.9.png',
+    'resources/drawable-xhdpi/blank.png',
+    'resources/drawable-xhdpi/bookmark_folder_closed.png',
+    'resources/drawable-xhdpi/bookmark_folder_opened.png',
+    'resources/drawable-xhdpi/close.png',
+    'resources/drawable-xhdpi/favicon.png',
+    'resources/drawable-xhdpi/find_close.png',
+    'resources/drawable-xhdpi/find_next.png',
+    'resources/drawable-xhdpi/find_prev.png',
+    'resources/drawable-xhdpi/folder.png',
+    'resources/drawable-xhdpi/grid_icon_bg_activated.9.png',
+    'resources/drawable-xhdpi/grid_icon_bg_focused.9.png',
+    'resources/drawable-xhdpi/handle_end.png',
+    'resources/drawable-xhdpi/handle_middle.png',
+    'resources/drawable-xhdpi/handle_start.png',
+    'resources/drawable-xhdpi/history_tabs_indicator_selected.9.png',
+    'resources/drawable-xhdpi/home_tab_menu_strip.9.png',
+    'resources/drawable-xhdpi/ic_menu_addons_filler.png',
+    'resources/drawable-xhdpi/ic_menu_bookmark_add.png',
+    'resources/drawable-xhdpi/ic_menu_bookmark_remove.png',
+    'resources/drawable-xhdpi/ic_menu_character_encoding.png',
+    'resources/drawable-xhdpi/ic_menu_forward.png',
+    'resources/drawable-xhdpi/ic_menu_guest.png',
+    'resources/drawable-xhdpi/ic_menu_new_private_tab.png',
+    'resources/drawable-xhdpi/ic_menu_new_tab.png',
+    'resources/drawable-xhdpi/ic_menu_reload.png',
+    'resources/drawable-xhdpi/ic_status_logo.png',
+    'resources/drawable-xhdpi/ic_url_bar_go.png',
+    'resources/drawable-xhdpi/ic_url_bar_reader.png',
+    'resources/drawable-xhdpi/ic_url_bar_search.png',
+    'resources/drawable-xhdpi/ic_url_bar_star.png',
+    'resources/drawable-xhdpi/ic_url_bar_tab.png',
+    'resources/drawable-xhdpi/icon_bookmarks_empty.png',
+    'resources/drawable-xhdpi/icon_last_tabs.png',
+    'resources/drawable-xhdpi/icon_last_tabs_empty.png',
+    'resources/drawable-xhdpi/icon_most_recent.png',
+    'resources/drawable-xhdpi/icon_most_recent_empty.png',
+    'resources/drawable-xhdpi/icon_most_visited.png',
+    'resources/drawable-xhdpi/icon_openinapp.png',
+    'resources/drawable-xhdpi/icon_pageaction.png',
+    'resources/drawable-xhdpi/icon_reading_list_empty.png',
+    'resources/drawable-xhdpi/larry.png',
+    'resources/drawable-xhdpi/lock_identified.png',
+    'resources/drawable-xhdpi/lock_verified.png',
+    'resources/drawable-xhdpi/menu.png',
+    'resources/drawable-xhdpi/menu_item_check.png',
+    'resources/drawable-xhdpi/menu_item_more.png',
+    'resources/drawable-xhdpi/menu_item_uncheck.png',
+    'resources/drawable-xhdpi/menu_panel_bg.9.png',
+    'resources/drawable-xhdpi/menu_pb.png',
+    'resources/drawable-xhdpi/menu_popup_arrow_bottom.png',
+    'resources/drawable-xhdpi/menu_popup_arrow_top.png',
+    'resources/drawable-xhdpi/menu_popup_bg.9.png',
+    'resources/drawable-xhdpi/pause.png',
+    'resources/drawable-xhdpi/pin.png',
+    'resources/drawable-xhdpi/play.png',
+    'resources/drawable-xhdpi/reader.png',
+    'resources/drawable-xhdpi/reader_active.png',
+    'resources/drawable-xhdpi/reader_cropped.png',
+    'resources/drawable-xhdpi/reading_list.png',
+    'resources/drawable-xhdpi/shield.png',
+    'resources/drawable-xhdpi/shield_doorhanger.png',
+    'resources/drawable-xhdpi/spinner_default.9.png',
+    'resources/drawable-xhdpi/spinner_focused.9.png',
+    'resources/drawable-xhdpi/spinner_pressed.9.png',
+    'resources/drawable-xhdpi/tab_close.png',
+    'resources/drawable-xhdpi/tab_indicator_divider.9.png',
+    'resources/drawable-xhdpi/tab_indicator_selected.9.png',
+    'resources/drawable-xhdpi/tab_indicator_selected_focused.9.png',
+    'resources/drawable-xhdpi/tab_new.png',
+    'resources/drawable-xhdpi/tab_new_pb.png',
+    'resources/drawable-xhdpi/tab_thumbnail_default.png',
+    'resources/drawable-xhdpi/tab_thumbnail_shadow.png',
+    'resources/drawable-xhdpi/tabs_count.png',
+    'resources/drawable-xhdpi/tabs_count_foreground.png',
+    'resources/drawable-xhdpi/tabs_normal.png',
+    'resources/drawable-xhdpi/tabs_private.png',
+    'resources/drawable-xhdpi/tabs_synced.png',
+    'resources/drawable-xhdpi/tip_addsearch.png',
+    'resources/drawable-xhdpi/top_site_add.png',
+    'resources/drawable-xhdpi/url_bar_entry_default.9.png',
+    'resources/drawable-xhdpi/url_bar_entry_default_pb.9.png',
+    'resources/drawable-xhdpi/url_bar_entry_pressed.9.png',
+    'resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png',
+    'resources/drawable-xhdpi/urlbar_stop.png',
+    'resources/drawable-xhdpi/validation_arrow.png',
+    'resources/drawable-xhdpi/validation_arrow_inverted.png',
+    'resources/drawable-xhdpi/validation_bg.9.png',
+    'resources/drawable-xhdpi/warning.png',
+    'resources/drawable-xhdpi/warning_doorhanger.png',
+    'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable-xlarge-v11/home_history_tabs_indicator.xml',
+    'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png',
+    'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png',
+    'resources/drawable/action_bar_button.xml',
+    'resources/drawable/action_bar_button_inverse.xml',
+    'resources/drawable/bookmark_folder.xml',
+    'resources/drawable/divider_horizontal.xml',
+    'resources/drawable/divider_vertical.xml',
+    'resources/drawable/handle_end_level.xml',
+    'resources/drawable/handle_start_level.xml',
+    'resources/drawable/home_banner.xml',
+    'resources/drawable/home_history_tabs_indicator.xml',
+    'resources/drawable/home_page_title_background.xml',
+    'resources/drawable/ic_menu_back.xml',
+    'resources/drawable/ic_menu_desktop_mode_off.xml',
+    'resources/drawable/ic_menu_desktop_mode_on.xml',
+    'resources/drawable/ic_menu_quit.xml',
+    'resources/drawable/icon_grid_item_bg.xml',
+    'resources/drawable/menu_item_state.xml',
+    'resources/drawable/menu_level.xml',
+    'resources/drawable/remote_tabs_child_divider.xml',
+    'resources/drawable/shaped_button.xml',
+    'resources/drawable/site_security_level.xml',
+    'resources/drawable/spinner.xml',
+    'resources/drawable/suggestion_selector.xml',
+    'resources/drawable/tab_new_level.xml',
+    'resources/drawable/tab_row.xml',
+    'resources/drawable/tab_thumbnail.xml',
+    'resources/drawable/tabs_panel_indicator.xml',
+    'resources/drawable/textbox_bg.xml',
+    'resources/drawable/toast_button.xml',
+    'resources/drawable/top_sites_thumbnail_bg.xml',
+    'resources/drawable/url_bar_bg.xml',
+    'resources/drawable/url_bar_entry.xml',
+    'resources/drawable/url_bar_nav_button.xml',
+    'resources/drawable/url_bar_right_edge.xml',
+    'resources/drawable/webapp_titlebar_bg.xml',
+    'resources/layout-large-land-v11/home_history_list.xml',
+    'resources/layout-large-land-v11/home_history_page.xml',
+    'resources/layout-large-land-v11/home_history_tabs_indicator.xml',
+    'resources/layout-large-land-v11/tabs_panel.xml',
+    'resources/layout-large-land-v11/tabs_panel_footer.xml',
+    'resources/layout-large-land-v11/tabs_panel_header.xml',
+    'resources/layout-large-v11/browser_toolbar.xml',
+    'resources/layout-large-v11/home_pager.xml',
+    'resources/layout-xlarge-v11/font_size_preference.xml',
+    'resources/layout-xlarge-v11/home_history_list.xml',
+    'resources/layout-xlarge-v11/home_history_page.xml',
+    'resources/layout-xlarge-v11/home_history_tabs_indicator.xml',
+    'resources/layout-xlarge-v11/remote_tabs_child.xml',
+    'resources/layout-xlarge-v11/remote_tabs_group.xml',
+    'resources/layout/arrow_popup.xml',
+    'resources/layout/autocomplete_list.xml',
+    'resources/layout/autocomplete_list_item.xml',
+    'resources/layout/bookmark_edit.xml',
+    'resources/layout/bookmark_folder_row.xml',
+    'resources/layout/bookmark_item_row.xml',
+    'resources/layout/browser_search.xml',
+    'resources/layout/browser_toolbar.xml',
+    'resources/layout/datetime_picker.xml',
+    'resources/layout/doorhanger.xml',
+    'resources/layout/doorhanger_button.xml',
+    'resources/layout/find_in_page_content.xml',
+    'resources/layout/font_size_preference.xml',
+    'resources/layout/gecko_app.xml',
+    'resources/layout/home_banner.xml',
+    'resources/layout/home_bookmarks_page.xml',
+    'resources/layout/home_empty_page.xml',
+    'resources/layout/home_empty_reading_page.xml',
+    'resources/layout/home_header_row.xml',
+    'resources/layout/home_history_list.xml',
+    'resources/layout/home_history_page.xml',
+    'resources/layout/home_history_tabs_indicator.xml',
+    'resources/layout/home_item_row.xml',
+    'resources/layout/home_last_tabs_page.xml',
+    'resources/layout/home_most_recent_page.xml',
+    'resources/layout/home_pager.xml',
+    'resources/layout/home_reading_list_page.xml',
+    'resources/layout/home_search_item_row.xml',
+    'resources/layout/home_suggestion_prompt.xml',
+    'resources/layout/home_top_sites_page.xml',
+    'resources/layout/icon_grid.xml',
+    'resources/layout/icon_grid_item.xml',
+    'resources/layout/launch_app_list.xml',
+    'resources/layout/launch_app_listitem.xml',
+    'resources/layout/list_item_header.xml',
+    'resources/layout/menu_action_bar.xml',
+    'resources/layout/menu_item_action_view.xml',
+    'resources/layout/menu_popup.xml',
+    'resources/layout/notification_icon_text.xml',
+    'resources/layout/notification_progress.xml',
+    'resources/layout/notification_progress_text.xml',
+    'resources/layout/pin_site_dialog.xml',
+    'resources/layout/preference_rightalign_icon.xml',
+    'resources/layout/preference_search_engine.xml',
+    'resources/layout/preference_search_tip.xml',
+    'resources/layout/remote_tabs_child.xml',
+    'resources/layout/remote_tabs_group.xml',
+    'resources/layout/search_engine_row.xml',
+    'resources/layout/select_dialog_list.xml',
+    'resources/layout/select_dialog_multichoice.xml',
+    'resources/layout/select_dialog_singlechoice.xml',
+    'resources/layout/shared_ui_components.xml',
+    'resources/layout/simple_dropdown_item_1line.xml',
+    'resources/layout/site_identity.xml',
+    'resources/layout/site_setting_item.xml',
+    'resources/layout/site_setting_title.xml',
+    'resources/layout/suggestion_item.xml',
+    'resources/layout/tab_menu_strip.xml',
+    'resources/layout/tabs_counter.xml',
+    'resources/layout/tabs_item_cell.xml',
+    'resources/layout/tabs_item_row.xml',
+    'resources/layout/tabs_panel.xml',
+    'resources/layout/tabs_panel_header.xml',
+    'resources/layout/tabs_panel_indicator.xml',
+    'resources/layout/text_selection_handles.xml',
+    'resources/layout/top_sites_grid_item_view.xml',
+    'resources/layout/two_line_page_row.xml',
+    'resources/layout/validation_message.xml',
+    'resources/layout/videoplayer.xml',
+    'resources/layout/web_app.xml',
+    'resources/menu-large-v11/browser_app_menu.xml',
+    'resources/menu-v11/browser_app_menu.xml',
+    'resources/menu-xlarge-v11/browser_app_menu.xml',
+    'resources/menu/browser_app_menu.xml',
+    'resources/menu/gecko_app_menu.xml',
+    'resources/menu/home_contextmenu.xml',
+    'resources/menu/titlebar_contextmenu.xml',
+    'resources/menu/top_sites_contextmenu.xml',
+    'resources/values-land/integers.xml',
+    'resources/values-land/layout.xml',
+    'resources/values-land/styles.xml',
+    'resources/values-large-land-v11/dimens.xml',
+    'resources/values-large-land-v11/styles.xml',
+    'resources/values-large-v11/dimens.xml',
+    'resources/values-large-v11/layout.xml',
+    'resources/values-large-v11/styles.xml',
+    'resources/values-large-v11/themes.xml',
+    'resources/values-v11/colors.xml',
+    'resources/values-v11/dimens.xml',
+    'resources/values-v11/styles.xml',
+    'resources/values-v11/themes.xml',
+    'resources/values-v14/styles.xml',
+    'resources/values-v16/styles.xml',
+    'resources/values-xlarge-land-v11/dimens.xml',
+    'resources/values-xlarge-land-v11/styles.xml',
+    'resources/values-xlarge-v11/dimens.xml',
+    'resources/values-xlarge-v11/integers.xml',
+    'resources/values-xlarge-v11/styles.xml',
+    'resources/values/arrays.xml',
+    'resources/values/attrs.xml',
+    'resources/values/colors.xml',
+    'resources/values/dimens.xml',
+    'resources/values/integers.xml',
+    'resources/values/layout.xml',
+    'resources/values/styles.xml',
+    'resources/values/themes.xml',
+    'resources/xml-v11/preference_headers.xml',
+    'resources/xml-v11/preferences.xml',
+    'resources/xml-v11/preferences_customize.xml',
+    'resources/xml-v11/preferences_customize_tablet.xml',
+    'resources/xml/preferences.xml',
+    'resources/xml/preferences_customize.xml',
+    'resources/xml/preferences_devtools.xml',
+    'resources/xml/preferences_display.xml',
+    'resources/xml/preferences_privacy.xml',
+    'resources/xml/preferences_search.xml',
+    'resources/xml/preferences_vendor.xml',
+    'resources/xml/searchable.xml',
+]
+
+if CONFIG['MOZ_CRASHREPORTER']:
+    ANDROID_RESFILES += [
+        'resources/drawable-mdpi/crash_reporter.png',
+        'resources/layout/crash_reporter.xml',
+    ]

mobile/android/base/tests/testReaderMode.java

@@ -21,9 +21,6 @@ public class testReaderMode extends AboutHomeTest {
     static final int EVENT_CLEAR_DELAY_MS = 3000;
     static final int READER_ICON_MAX_WAIT_MS = 15000;
 
-    // IDs for UI views.
-    private static final String PAGE_ACTION_LAYOUT_ID = "page_action_layout";
-
     @Override
     protected int getTestType() {
         return TEST_MOCHITEST;
@@ -156,7 +153,7 @@ public class testReaderMode extends AboutHomeTest {
 
     // Get the reader icon method
     protected View getReaderIcon() {
-        View pageActionLayout = mSolo.getView(PAGE_ACTION_LAYOUT_ID);
+        View pageActionLayout = mSolo.getView(0x7f070025);
         final ViewGroup actionLayoutEntry = (ViewGroup)pageActionLayout;
         View icon = actionLayoutEntry.getChildAt(1);
         if (icon == null || icon.getVisibility() != View.VISIBLE) {

mobile/android/tests/background/junit3/android-services.mozbuild

@@ -4,3 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+ANDROID_RESFILES += [
+    'res/drawable-hdpi/icon.png',
+    'res/drawable-ldpi/icon.png',
+    'res/drawable-mdpi/icon.png',
+    'res/layout/main.xml',
+    'res/values/strings.xml',
+]

python/mozbuild/mozbuild/frontend/emitter.py

@@ -191,7 +191,7 @@ class TreeMetadataEmitter(LoggingMixin):
         varmap = dict(
             # Makefile.in : moz.build
             ANDROID_GENERATED_RESFILES='ANDROID_GENERATED_RESFILES',
-            ANDROID_RES_DIRS='ANDROID_RES_DIRS',
+            ANDROID_RESFILES='ANDROID_RESFILES',
             CPP_UNIT_TESTS='CPP_UNIT_TESTS',
             EXPORT_LIBRARY='EXPORT_LIBRARY',
             EXTRA_COMPONENTS='EXTRA_COMPONENTS',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -64,11 +64,10 @@ VARIABLES = {
         file.
         """, 'export'),
 
-    'ANDROID_RES_DIRS': (list, list, [],
-        """Android resource directories.
+    'ANDROID_RESFILES': (StrictOrderingOnAppendList, list, [],
+        """Android resource files.
 
-        This variable contains a list of directories, each relative to
-        the srcdir, containing static files to package into a 'res'
+        This variable contains a list of files to package into a 'res'
         directory and merge into an APK file.
         """, 'export'),